Renamed menu items in preparation for the new menu structure. You have t...

...o move them to the right position though.