unify names (menus)
Merge pull request #1803 from cmgustavo/ui/menu

unify names (menus)