Fix mapping of field name to key when are not the same