Renamed menu items in preparation for the new menu structure. You have to move them to the right position though.