Minor changes to variable names only.