Rename some things.