Rename more stuff.