minor naming tweaks