minor updates to variable naming