diff --git a/ccm-cms-bundle/application.xml b/ccm-cms-bundle/application.xml
index 2d2d19a11..7ccff86cc 100644
--- a/ccm-cms-bundle/application.xml
+++ b/ccm-cms-bundle/application.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
-  name="ccm-bundle"
+  name="ccm-cms-bundle"
   prettyName="LibreCMS based on CCM"
   version="6.6.0"
   release="2"
diff --git a/ccm-cms-bundle/bundles/base/cfg/integration.properties b/ccm-cms-bundle/bundles/base/cfg/integration.properties
index 12a1aa734..f84223842 100644
--- a/ccm-cms-bundle/bundles/base/cfg/integration.properties
+++ b/ccm-cms-bundle/bundles/base/cfg/integration.properties
@@ -183,7 +183,7 @@ com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCat
 # ##############################################################################
 # Required to point to the package containing the theme to copy from when creating
 # a new theme! (In addition to default_theme_path. Otherwise no files are copied!
-themedirector.default_theme_manifest=ccm-bundle.web.mf
+themedirector.default_theme_manifest=ccm-cms-bundle.web.mf
 # Required to denote the dir containing the default theme!
 themedirector.default_theme_path=themes/foundry-base
 
@@ -198,9 +198,9 @@ com.arsdigita.london.search.num_threads=0
 auth.http.admin_email=webmaster@aplaws.org
 auth.http.admin_identifier=webmaster
 
-# ccm-bundle integration package configuration parameter
+# ccm-cms-bundle integration package configuration parameter
 # ##############################################################################
-# ccm-bundle (Loader only)
+# ccm-cms-bundle (Loader only)
 #com.arsdigita.bundle.loader.category_files=bundle/categories/sci-nav-domain-1.00.xml,bundle/categories/sci-nav-hierarchy-1.00.xml
 #com.arsdigita.bundle.loader.custom_app_instances=com.arsdigita.navigation.Navigation:scimenu:ScientificCMS Navigation Menu,com.arsdigita.navigation.Navigation:libmenu:LibreCMS Navigation Menu 
 #com.arsdigita.bundle.loader.domain_mappings=STD-NAV:/navigation/,STD-NAV:/generic/,STD-NAV:/portal/
diff --git a/ccm-cms-bundle/bundles/base/cfg/project.xml b/ccm-cms-bundle/bundles/base/cfg/project.xml
index 86f087079..1b4619ebd 100644
--- a/ccm-cms-bundle/bundles/base/cfg/project.xml
+++ b/ccm-cms-bundle/bundles/base/cfg/project.xml
@@ -56,7 +56,7 @@
         <ccm:application name="ccm-ldn-util"/>
 
 <!--   LibreCMS bundle  -->
-        <ccm:application name="ccm-bundle"/>
+        <ccm:application name="ccm-cms-bundle"/>
 
 
 
@@ -163,7 +163,7 @@
         <ccm:application name="ccm-user-preferences"/>               -->
 
 <!--   LDN extension  -->
-<!--    Conflicts with ccm-bundle (this package)                     -->
+<!--    Conflicts with ccm-cms-bundle (this package)                     -->
 <!--    and contains very ldn specific (esd) meta tags               -->
 <!--    <ccm:application name="ccm-ldn-aplaws"/>                     -->
 <!--    In it's current implementation very ldn / aplaws specific
diff --git a/ccm-cms-bundle/bundles/demo/cfg/integration.properties b/ccm-cms-bundle/bundles/demo/cfg/integration.properties
index b93ee6bf8..ee1a9f263 100644
--- a/ccm-cms-bundle/bundles/demo/cfg/integration.properties
+++ b/ccm-cms-bundle/bundles/demo/cfg/integration.properties
@@ -188,7 +188,7 @@ com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCat
 # ##############################################################################
 # Required to point to the package containing the theme to copy from when creating
 # a new theme! (In addition to default_theme_path. Otherwise no files are copied!
-themedirector.default_theme_manifest=ccm-bundle.web.mf
+themedirector.default_theme_manifest=ccm-cms-bundle.web.mf
 # Required to denote the dir containing the default theme!
 themedirector.default_theme_path=themes/foundry-base
 
@@ -203,9 +203,9 @@ com.arsdigita.london.search.num_threads=0
 auth.http.admin_email=webmaster@aplaws.org
 auth.http.admin_identifier=webmaster
 
-# ccm-bundle integration package configuration parameter
+# ccm-cms-bundle integration package configuration parameter
 # ##############################################################################
-# ccm-bundle (Loader only)
+# ccm-cms-bundle (Loader only)
 #com.arsdigita.bundle.loader.category_files=bundle/categories/sci-nav-domain-1.00.xml,bundle/categories/sci-nav-hierarchy-1.00.xml
 #com.arsdigita.bundle.loader.custom_app_instances=com.arsdigita.navigation.Navigation:scimenu:ScientificCMS Navigation Menu,com.arsdigita.navigation.Navigation:libmenu:LibreCMS Navigation Menu 
 #com.arsdigita.bundle.loader.domain_mappings=STD-NAV:/navigation/,STD-NAV:/generic/,STD-NAV:/portal/
diff --git a/ccm-cms-bundle/bundles/demo/cfg/project.xml b/ccm-cms-bundle/bundles/demo/cfg/project.xml
index 8e9c2d649..ca36862d8 100644
--- a/ccm-cms-bundle/bundles/demo/cfg/project.xml
+++ b/ccm-cms-bundle/bundles/demo/cfg/project.xml
@@ -54,7 +54,7 @@
         <ccm:application name="ccm-ldn-util"/>
 
 <!--   LibreCMS bundle  -->
-        <ccm:application name="ccm-bundle"/>
+        <ccm:application name="ccm-cms-bundle"/>
 
 
 
@@ -163,7 +163,7 @@
         <ccm:application name="ccm-user-preferences"/>               -->
 
 <!--   LDN extension  -->
-<!--    Conflicts with ccm-bundle (this package)                     -->
+<!--    Conflicts with ccm-cms-bundle (this package)                     -->
 <!--    and includes very ldn specific (esd) meta tags               -->
 <!--    <ccm:application name="ccm-ldn-aplaws"/>                     -->
 <!--    In it's current implementation very ldn / aplaws specific
diff --git a/ccm-cms-bundle/bundles/devel/cfg/integration.properties b/ccm-cms-bundle/bundles/devel/cfg/integration.properties
index 717a56970..77df44b82 100644
--- a/ccm-cms-bundle/bundles/devel/cfg/integration.properties
+++ b/ccm-cms-bundle/bundles/devel/cfg/integration.properties
@@ -189,7 +189,7 @@ com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCat
 # ##############################################################################
 # Required to point to the package containing the theme to copy from when creating
 # a new theme! (In addition to default_theme_path. Otherwise no files are copied!
-themedirector.default_theme_manifest=ccm-bundle.web.mf
+themedirector.default_theme_manifest=ccm-cms-bundle.web.mf
 # Required to denote the dir containing the default theme!
 themedirector.default_theme_path=themes/foundry-base
 
@@ -204,9 +204,9 @@ com.arsdigita.london.search.num_threads=0
 auth.http.admin_email=webmaster@aplaws.org
 auth.http.admin_identifier=webmaster
 
-# ccm-bundle integration package configuration parameter
+# ccm-cms-bundle integration package configuration parameter
 # ##############################################################################
-# ccm-bundle (Loader only)
+# ccm-cms-bundle (Loader only)
 #com.arsdigita.bundle.loader.category_files=bundle/categories/sci-nav-domain-1.00.xml,bundle/categories/sci-nav-hierarchy-1.00.xml
 #com.arsdigita.bundle.loader.custom_app_instances=com.arsdigita.navigation.Navigation:scimenu:ScientificCMS Navigation Menu,com.arsdigita.navigation.Navigation:libmenu:LibreCMS Navigation Menu 
 #com.arsdigita.bundle.loader.domain_mappings=STD-NAV:/navigation/,STD-NAV:/generic/,STD-NAV:/portal/
diff --git a/ccm-cms-bundle/bundles/devel/cfg/project.xml b/ccm-cms-bundle/bundles/devel/cfg/project.xml
index cdd266b88..154f597a8 100644
--- a/ccm-cms-bundle/bundles/devel/cfg/project.xml
+++ b/ccm-cms-bundle/bundles/devel/cfg/project.xml
@@ -49,7 +49,7 @@
         <ccm:application name="ccm-ldn-util"/>
 
 <!--   LibreCMS bundle  -->
-        <ccm:application name="ccm-bundle"/>
+        <ccm:application name="ccm-cms-bundle"/>
 
 
 
@@ -176,7 +176,7 @@
         <ccm:application name="ccm-user-preferences"/>               -->
 
 <!--   LDN extension  -->
-<!--    Conflicts with ccm-bundle (this package)                     -->
+<!--    Conflicts with ccm-cms-bundle (this package)                     -->
 <!--    and contains very ldn specific meta tags (esd)               -->
 <!--    <ccm:application name="ccm-ldn-aplaws"/>                     -->
 <!--    In it's current implementation very ldn / aplaws specific
diff --git a/ccm-cms-bundle/bundles/slimline/cfg/integration.properties b/ccm-cms-bundle/bundles/slimline/cfg/integration.properties
index 7a86caf16..439b4f469 100644
--- a/ccm-cms-bundle/bundles/slimline/cfg/integration.properties
+++ b/ccm-cms-bundle/bundles/slimline/cfg/integration.properties
@@ -183,7 +183,7 @@ com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCat
 # ##############################################################################
 # Required to point to the package containing the theme to copy from when creating
 # a new theme! (In addition to default_theme_path. Otherwise no files are copied!
-themedirector.default_theme_manifest=ccm-bundle.web.mf
+themedirector.default_theme_manifest=ccm-cms-bundle.web.mf
 # Required to denote the dir containing the default theme!
 themedirector.default_theme_path=themes/foundry-base
 
@@ -198,9 +198,9 @@ com.arsdigita.london.search.num_threads=0
 auth.http.admin_email=webmaster@aplaws.org
 auth.http.admin_identifier=webmaster
 
-# ccm-bundle integration package configuration parameter
+# ccm-cms-bundle integration package configuration parameter
 # ##############################################################################
-# ccm-bundle (Loader only)
+# ccm-cms-bundle (Loader only)
 #com.arsdigita.bundle.loader.category_files=bundle/categories/sci-nav-domain-1.00.xml,bundle/categories/sci-nav-hierarchy-1.00.xml
 #com.arsdigita.bundle.loader.custom_app_instances=com.arsdigita.navigation.Navigation:scimenu:ScientificCMS Navigation Menu,com.arsdigita.navigation.Navigation:libmenu:LibreCMS Navigation Menu 
 #com.arsdigita.bundle.loader.domain_mappings=STD-NAV:/navigation/,STD-NAV:/generic/,STD-NAV:/portal/
diff --git a/ccm-cms-bundle/bundles/slimline/cfg/project.xml b/ccm-cms-bundle/bundles/slimline/cfg/project.xml
index ae5d6ddfc..f720f72bd 100644
--- a/ccm-cms-bundle/bundles/slimline/cfg/project.xml
+++ b/ccm-cms-bundle/bundles/slimline/cfg/project.xml
@@ -55,7 +55,7 @@
         <ccm:application name="ccm-ldn-util"/>
 
 <!--   LibreCMS bundle  -->
-        <ccm:application name="ccm-bundle"/>
+        <ccm:application name="ccm-cms-bundle"/>
 
 
 
@@ -171,7 +171,7 @@
 
 
 <!--   LDN extension  -->
-<!--    Conflicts with ccm-bundle (this package)                     -->
+<!--    Conflicts with ccm-cms-bundle (this package)                     -->
 <!--    and contains very ldn specific (esd) meta tags               -->
 <!--    <ccm:application name="ccm-ldn-aplaws"/>                     -->
 <!--    In it's current implementation very ldn / aplaws specific
diff --git a/ccm-cms-bundle/bundles/standard/cfg/integration.properties b/ccm-cms-bundle/bundles/standard/cfg/integration.properties
index 81301399d..7fd0b21c6 100644
--- a/ccm-cms-bundle/bundles/standard/cfg/integration.properties
+++ b/ccm-cms-bundle/bundles/standard/cfg/integration.properties
@@ -183,7 +183,7 @@ com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCat
 # ##############################################################################
 # Required to point to the package containing the theme to copy from when creating
 # a new theme! (In addition to default_theme_path. Otherwise no files are copied!
-themedirector.default_theme_manifest=ccm-bundle.web.mf
+themedirector.default_theme_manifest=ccm-cms-bundle.web.mf
 # Required to denote the dir containing the default theme!
 themedirector.default_theme_path=themes/foundry-base
 
@@ -198,9 +198,9 @@ com.arsdigita.london.search.num_threads=0
 auth.http.admin_email=webmaster@aplaws.org
 auth.http.admin_identifier=webmaster
 
-# ccm-bundle integration package configuration parameter
+# ccm-cms-bundle integration package configuration parameter
 # ##############################################################################
-# ccm-bundle (Loader only)
+# ccm-cms-bundle (Loader only)
 #com.arsdigita.bundle.loader.category_files=bundle/categories/sci-nav-domain-1.00.xml,bundle/categories/sci-nav-hierarchy-1.00.xml
 #com.arsdigita.bundle.loader.custom_app_instances=com.arsdigita.navigation.Navigation:scimenu:ScientificCMS Navigation Menu,com.arsdigita.navigation.Navigation:libmenu:LibreCMS Navigation Menu 
 #com.arsdigita.bundle.loader.domain_mappings=STD-NAV:/navigation/,STD-NAV:/generic/,STD-NAV:/portal/
diff --git a/ccm-cms-bundle/bundles/standard/cfg/project.xml b/ccm-cms-bundle/bundles/standard/cfg/project.xml
index 5cd997fc4..6729e5471 100644
--- a/ccm-cms-bundle/bundles/standard/cfg/project.xml
+++ b/ccm-cms-bundle/bundles/standard/cfg/project.xml
@@ -55,7 +55,7 @@
         <ccm:application name="ccm-ldn-util"/>
 
 <!--   LibreCMS bundle  -->
-        <ccm:application name="ccm-bundle"/>
+        <ccm:application name="ccm-cms-bundle"/>
 
 
 
@@ -168,7 +168,7 @@
 
 
 <!--   LDN extension  -->
-<!--    Conflicts with ccm-bundle (this package)                     -->
+<!--    Conflicts with ccm-cms-bundle (this package)                     -->
 <!--    and contains very ldn specific (esd) meta tags               -->
 <!--    <ccm:application name="ccm-ldn-aplaws"/>                     -->
 <!--    In it's current implementation very ldn / aplaws specific
diff --git a/ccm-cms-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_nav_templates_table.sql b/ccm-cms-bundle/sql/ccm-cms-bundle/upgrade/default/0.0.0-6.6.0/upd_nav_templates_table.sql
similarity index 100%
rename from ccm-cms-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_nav_templates_table.sql
rename to ccm-cms-bundle/sql/ccm-cms-bundle/upgrade/default/0.0.0-6.6.0/upd_nav_templates_table.sql
diff --git a/ccm-cms-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_system_tables.sql b/ccm-cms-bundle/sql/ccm-cms-bundle/upgrade/default/0.0.0-6.6.0/upd_system_tables.sql
similarity index 100%
rename from ccm-cms-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_system_tables.sql
rename to ccm-cms-bundle/sql/ccm-cms-bundle/upgrade/default/0.0.0-6.6.0/upd_system_tables.sql
diff --git a/ccm-cms-bundle/sql/ccm-bundle/upgrade/oracle-se-0.0.0-6.6.0.sql b/ccm-cms-bundle/sql/ccm-cms-bundle/upgrade/oracle-se-0.0.0-6.6.0.sql
similarity index 100%
rename from ccm-cms-bundle/sql/ccm-bundle/upgrade/oracle-se-0.0.0-6.6.0.sql
rename to ccm-cms-bundle/sql/ccm-cms-bundle/upgrade/oracle-se-0.0.0-6.6.0.sql
diff --git a/ccm-cms-bundle/sql/ccm-bundle/upgrade/postgres-0.0.0-6.6.0.sql b/ccm-cms-bundle/sql/ccm-cms-bundle/upgrade/postgres-0.0.0-6.6.0.sql
similarity index 100%
rename from ccm-cms-bundle/sql/ccm-bundle/upgrade/postgres-0.0.0-6.6.0.sql
rename to ccm-cms-bundle/sql/ccm-cms-bundle/upgrade/postgres-0.0.0-6.6.0.sql
diff --git a/ccm-cms-bundle/src/ccm-bundle.config b/ccm-cms-bundle/src/ccm-cms-bundle.config
similarity index 100%
rename from ccm-cms-bundle/src/ccm-bundle.config
rename to ccm-cms-bundle/src/ccm-cms-bundle.config
diff --git a/ccm-cms-bundle/src/ccm-bundle.load b/ccm-cms-bundle/src/ccm-cms-bundle.load
similarity index 100%
rename from ccm-cms-bundle/src/ccm-bundle.load
rename to ccm-cms-bundle/src/ccm-cms-bundle.load
diff --git a/ccm-cms-bundle/src/ccm-bundle.upgrade b/ccm-cms-bundle/src/ccm-cms-bundle.upgrade
similarity index 100%
rename from ccm-cms-bundle/src/ccm-bundle.upgrade
rename to ccm-cms-bundle/src/ccm-cms-bundle.upgrade