CMS-4154 Schemas in modules - Unify ModuleKey and ModuleName