Matched definition convention for all menus to resolve Issue Close #147