naming tweaks