More tweaks to variable names