Handle uppercase field names