change some field names