Fix the field names