Rename a few things.