rename a few variables to more suitable names