Rename a couple of things