small naming tweaks