zone naming tweaks