Saner names for menu handling