rename a few things