More field name normalization, clean-up