Fixing the field names