rename some variables, no functionality changes