Rename a few fields