Fixed issue #410: Change some menu item name to make it clear