minor changes to variable names