field name fixes