Remove Broadleaf messages from DemoSite, remove module from key name