MORTEVIELLE: Some more renaming, introduce MENU_NONE constant