Minor tweaks to variable names.