Rename a bunch of vars