Revert "Revert "better naming convention""

This reverts commit b0ec50381ad1a278b32b952fc7f98a5dad30aa45.
Revert "Revert "Revert "Revert "reorganization of menu items""""

This reverts commit 435e61b157504d0662dbcbc912ce58b61c04a0cb.