diff --git a/src/main/resources/cms/org.apache.sling.event.jobs.QueueConfiguration~sling_cms.json b/src/main/resources/cms/org.apache.sling.event.jobs.QueueConfiguration~sling-cms.json
similarity index 100%
rename from src/main/resources/cms/org.apache.sling.event.jobs.QueueConfiguration~sling_cms.json
rename to src/main/resources/cms/org.apache.sling.event.jobs.QueueConfiguration~sling-cms.json
diff --git a/src/main/resources/cms/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~serviceuser_webconsole.json b/src/main/resources/cms/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~serviceuser-webconsole.json
similarity index 100%
rename from src/main/resources/cms/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~serviceuser_webconsole.json
rename to src/main/resources/cms/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~serviceuser-webconsole.json
diff --git a/src/main/resources/cms/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_cms.json b/src/main/resources/cms/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-cms.json
similarity index 100%
rename from src/main/resources/cms/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_cms.json
rename to src/main/resources/cms/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-cms.json
diff --git a/src/main/resources/cms/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_cms_error.json b/src/main/resources/cms/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-cms-error.json
similarity index 100%
rename from src/main/resources/cms/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_cms_error.json
rename to src/main/resources/cms/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-cms-error.json
diff --git a/src/main/resources/cms/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_cms_metadata.json b/src/main/resources/cms/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-cms-metadata.json
similarity index 100%
rename from src/main/resources/cms/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_cms_metadata.json
rename to src/main/resources/cms/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-cms-metadata.json
diff --git a/src/main/resources/cms/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_cms_transformer.json b/src/main/resources/cms/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-cms-transformer.json
similarity index 100%
rename from src/main/resources/cms/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_cms_transformer.json
rename to src/main/resources/cms/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-cms-transformer.json
diff --git a/src/main/resources/cms/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_cms_ugc.json b/src/main/resources/cms/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-cms-ugc.json
similarity index 100%
rename from src/main/resources/cms/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_cms_ugc.json
rename to src/main/resources/cms/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-cms-ugc.json
diff --git a/src/main/resources/cms/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_cms_versionmgr.json b/src/main/resources/cms/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-cms-versionmgr.json
similarity index 100%
rename from src/main/resources/cms/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_cms_versionmgr.json
rename to src/main/resources/cms/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-cms-versionmgr.json
diff --git a/src/main/resources/composum/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~composum_nodes.json b/src/main/resources/composum/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~composum-nodes.json
similarity index 100%
rename from src/main/resources/composum/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~composum_nodes.json
rename to src/main/resources/composum/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~composum-nodes.json
diff --git a/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_discovery.json b/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling-discovery.json
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_discovery.json
rename to src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling-discovery.json
diff --git a/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_jcr.json b/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling-jcr.json
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_jcr.json
rename to src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling-jcr.json
diff --git a/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_servlets.json b/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling-servlets.json
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_servlets.json
rename to src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling-servlets.json
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_caconfig.json b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-caconfig.json
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_caconfig.json
rename to src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-caconfig.json
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_clam.json b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-clam.json
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_clam.json
rename to src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-clam.json
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_discovery.json b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-discovery.json
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_discovery.json
rename to src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-discovery.json
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_event.json b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-event.json
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_event.json
rename to src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-event.json
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_installer_factory_packages.json b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-installer-factory-packages.json
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_installer_factory_packages.json
rename to src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-installer-factory-packages.json
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_installer_provider_jcr.json b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-installer-provider-jcr.json
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_installer_provider_jcr.json
rename to src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-installer-provider-jcr.json
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_jcr_contentloader.json b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-jcr-contentloader.json
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_jcr_contentloader.json
rename to src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-jcr-contentloader.json
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_jcr_jackrabbit_usermanager.json b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-jcr-jackrabbit-usermanager.json
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_jcr_jackrabbit_usermanager.json
rename to src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-jcr-jackrabbit-usermanager.json
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_mapping.json b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-mapping.json
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_mapping.json
rename to src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-mapping.json
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_readall.json b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-readall.json
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_readall.json
rename to src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-readall.json
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_scripting.json b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-scripting.json
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_scripting.json
rename to src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-scripting.json
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_validation.json b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-validation.json
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_validation.json
rename to src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-validation.json
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_xss.json b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-xss.json
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_xss.json
rename to src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-xss.json
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_auth_core.json b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-auth-core.json
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_auth_core.json
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-auth-core.json
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_caconfig.json b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-caconfig.json
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_caconfig.json
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-caconfig.json
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_clam.json b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-clam.json
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_clam.json
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-clam.json
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_discovery.json b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-discovery.json
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_discovery.json
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-discovery.json
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_event.json b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-event.json
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_event.json
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-event.json
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_i18n.json b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-i18n.json
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_i18n.json
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-i18n.json
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_installer_factory_packages.json b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-installer-factory-packages.json
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_installer_factory_packages.json
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-installer-factory-packages.json
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_installer_provider_jcr.json b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-installer-provider-jcr.json
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_installer_provider_jcr.json
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-installer-provider-jcr.json
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_contentloader.json b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-jcr-contentloader.json
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_contentloader.json
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-jcr-contentloader.json
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_jackrabbit_usermanager.json b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-jcr-jackrabbit-usermanager.json
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_jackrabbit_usermanager.json
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-jcr-jackrabbit-usermanager.json
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_resource.json b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-jcr-resource.json
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_resource.json
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-jcr-resource.json
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resource_presence.json b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-resource-presence.json
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resource_presence.json
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-resource-presence.json
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resourceresolver.json b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-resourceresolver.json
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resourceresolver.json
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-resourceresolver.json
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_rewriter.json b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-rewriter.json
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_rewriter.json
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-rewriter.json
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_htl.json b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-scripting-htl.json
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_htl.json
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-scripting-htl.json
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_thymeleaf.json b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-scripting-thymeleaf.json
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_thymeleaf.json
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-scripting-thymeleaf.json
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting.json b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-scripting.json
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting.json
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-scripting.json
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_servlets.json b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-servlets.json
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_servlets.json
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-servlets.json
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_validation.json b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-validation.json
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_validation.json
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-validation.json
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_xss.json b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-xss.json
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_xss.json
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-xss.json
diff --git a/src/main/resources/starter/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_starter.json b/src/main/resources/starter/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-starter.json
similarity index 100%
rename from src/main/resources/starter/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_starter.json
rename to src/main/resources/starter/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-starter.json