rename a few variables