menu_item -> menubar_item internally.  No user-visible change.