Tweaks to variable names