Switched to dialog-based menus, also renamed.