Rename some fields