Use module names as menu titles
Merge pull request #3362 from aaronschachter/config_cleanup

Use module names as menu titles