more field name fixes