Small naming tweaks