Rename a few things, see commit message.