Minor changes to variable names.