Rename some fields.