Handle field name mappings