Add support for deprecated mapping

To add backwards compatibility, additional mappings were added in the Attribute mapping. Unit tests confirmed successful mapping.

Please review: @npblair @paul.erickson @ahoffmann