Change some field names