Adjust field names