CLSN-343 Rename submenus