Renamed some fields.