minor variable naming tweaks