Cleanup naming of menu items, and update Readme.md