diff --git a/ccm-bundle/application.xml b/ccm-bundle/application.xml
index 6bc53ddb9..603b7aef7 100644
--- a/ccm-bundle/application.xml
+++ b/ccm-bundle/application.xml
@@ -10,7 +10,7 @@
     <ccm:requires name="ccm-cms" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-navigation" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-portalworkspace" version="6.6.1" relation="ge"/>
-    <ccm:requires name="ccm-ldn-subsite" version="6.6.0" relation="ge"/>
+    <ccm:requires name="ccm-subsite" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-ldn-terms" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-ldn-search" version="6.6.0" relation="ge"/>
   </ccm:dependencies>
diff --git a/ccm-bundle/bundles/demo/cfg/integration.properties b/ccm-bundle/bundles/demo/cfg/integration.properties
index c6bf6108d..86ccc3737 100644
--- a/ccm-bundle/bundles/demo/cfg/integration.properties
+++ b/ccm-bundle/bundles/demo/cfg/integration.properties
@@ -1,4 +1,4 @@
-# Scientific CMS demo bundle integration.properties
+# Libre CMS demo bundle integration.properties
 #
 waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
 #
@@ -22,7 +22,7 @@ waf.auto_registration_on=false
 
 ; Searches for localized style sheet (among others) 
 waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
-waf.templating.stylesheet_paths=/WEB-INF/resources/scientificCMS-stylesheet-paths.txt
+waf.templating.stylesheet_paths=/WEB-INF/resources/librecms-stylesheet-paths.txt
 
 core.ui.pagemap.root_page_url=navigation/
 core.ui.pagemap.workspace_url=navigation/
@@ -42,7 +42,7 @@ com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCatego
 
 com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp
 com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
-com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver
+com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatcher.SubsiteItemTemplateResolver
 
 ; Configure dhtml editor for use in cms content-center
 ; Xinha is default and should work out of the box
@@ -55,8 +55,8 @@ com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/CCMcmsXinhaConfi
 ; com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js
 ; com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js
 ; com.arsdigita.cms.dhtml_editor_hidden_buttons=
-; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
-com.arsdigita.cms.dhtml_editor_plugins=
+; com.arsdigita.cms.dhtml_editor_plugins=
+
 
 com.arsdigita.cms.disable_item_pfs=true
 
@@ -96,10 +96,15 @@ com.arsdigita.forum.disable_page_caching=true
 
 
 # ccm-navigation application
+; com.arsdigita.navigation.category_menu_show_grand_children_min=1
+; com.arsdigita.navigation.category_menu_show_grand_children=adaptive
+; com.arsdigita.navigation.category_menu_show_grand_children_limit=1
+; com.arsdigita.navigation.category_menu_show_grand_children_max=65536
 com.arsdigita.navigation.category_menu_show_grand_children=false
+; com.arsdigita.navigation.category_menu_show_nephews=false
 com.arsdigita.navigation.default_cat_root_path=/navigation/
-com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/sci-default.jsp
-com.arsdigita.navigation.templates_file=bundle/navigation/sci-templates.txt
+com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/gen-default.jsp
+com.arsdigita.navigation.templates_file=bundle/navigation/gen-templates.txt
 
 
 # ccm-ldn-search application
@@ -107,19 +112,20 @@ com.arsdigita.london.search.show_sponsored_links=true
 
 
 # ccm-ldn-subsite application
-com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
 
-# ccm-ldn-themedirector application
+# ccm-themedirector application
 themedirector.default_theme_context=
 # themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf
 themedirector.default_theme_path=themes/static/aplaws-generic
 themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl
 
 
-# ccm-sci-bundle (Loader only)
-#com.arsdigita.bundle.category_files=bundle/categories/sci-nav-domain-1.00.xml,bundle/categories/sci-nav-hierarchy-1.00.xml
-
+# ccm-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/
 # =============================================================================================
 # runtime specific configurations
 
diff --git a/ccm-bundle/bundles/demo/cfg/project.xml b/ccm-bundle/bundles/demo/cfg/project.xml
index 75df5a621..0c60f93aa 100644
--- a/ccm-bundle/bundles/demo/cfg/project.xml
+++ b/ccm-bundle/bundles/demo/cfg/project.xml
@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!--  project.xml SCI devel - containing only modules used for ScientificCMS  -->
+<!--  project.xml LibreCMS devel - containing only modules used for LibreCMS  -->
 
-<ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
+<ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
                xmlns:ccm="http://ccm.redhat.com/ccm-project" 
               ccmVersion="6.1" 
-                    name="ScientificCMS" 
-              prettyName="Scientific CMS" 
-                 version="1-1-6" 
-                 release="devel" 
-                  webxml="web-sci.xml" 
+                    name="librecms-ccm" 
+              prettyName="LibreCMS OpenCCM" 
+                 version="0-0-0" 
+                 release="trunk-r1323" 
+                  webxml="web-ccm.xml" 
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
 
-  <ccm:build>
+<ccm:databases>
+	<ccm:database name="postgres"/>
+</ccm:databases>
+
+
+<ccm:build>
 
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 <!--    Scientific CMS set of CORE packages                                  -->
@@ -36,13 +41,14 @@
 
 <!--   Applications   -->
         <ccm:application name="ccm-navigation"/>
+        <!-- ccm-portalworkspace depends on ccm-subsite  -->
         <ccm:application name="ccm-portalworkspace"/>
+        <ccm:application name="ccm-subsite"/>                    
         <ccm:application name="ccm-themedirector"/>
 
 <!--   LDN extension  -->
         <ccm:application name="ccm-ldn-search"/>
         <ccm:application name="ccm-ldn-shortcuts"/>
-        <ccm:application name="ccm-ldn-subsite"/>                    
         <ccm:application name="ccm-ldn-terms"/>
         <ccm:application name="ccm-ldn-util"/>
 
diff --git a/ccm-bundle/bundles/demo/cfg/web-sci.xml b/ccm-bundle/bundles/demo/cfg/web-sci.xml
index 5babaffe0..55290512c 100644
--- a/ccm-bundle/bundles/demo/cfg/web-sci.xml
+++ b/ccm-bundle/bundles/demo/cfg/web-sci.xml
@@ -4,8 +4,8 @@
     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
                version="2.4">
 
-  <display-name>Scientific CMS</display-name> 
-  <description>Content and Collaboration Management for Scientific Institutions</description>
+  <display-name>LibreCMS DEMO Site</display-name> 
+  <description>Community and Content Management</description>
 
   <!-- path and filename of the log4j user accessible config file
        WEB-INF/conf/log4j.properties is the built-in default value -->
@@ -17,14 +17,13 @@
 
   <!-- Require secure connection by redirect to host-port part
        of parameter waf.web.secure_server               
-       NOT USED with ZeS                                        
   <filter>
     <filter-name>secured</filter-name>
     <filter-class>com.arsdigita.web.SecureFilter</filter-class>
   </filter>
   -->
   <!-- Initialize Profiler timers
-       NOT USED with ZeS standard / production                                  
+       NOT USED with standard / production                                  
   <filter>
     <filter-name>profiler</filter-name>
     <filter-class>com.arsdigita.profiler.ProfilerFilter</filter-class>
@@ -38,7 +37,7 @@
 
   <filter>
     <filter-name>subsite</filter-name>
-    <filter-class>com.arsdigita.london.subsite.SubsiteFilter</filter-class>
+    <filter-class>com.arsdigita.subsite.SubsiteFilter</filter-class>
   </filter>
 
 <!--    NOT USED HERE
@@ -277,7 +276,7 @@
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-subsite</param-value>
+      <param-value>/templates/ccm-subsite</param-value>
     </init-param>
   </servlet>
   <!-- module ccm-ldn-subsite  -  servlet declarations END  -->
@@ -375,7 +374,7 @@
   <!-- module ccm-ldn-subsite  -  servlet mappings BEGIN  -->
   <servlet-mapping>
     <servlet-name>subsite-files</servlet-name>
-    <url-pattern>/ccm-ldn-subsite/files/*</url-pattern>
+    <url-pattern>/ccm-subsite/files/*</url-pattern>
   </servlet-mapping>
   <!-- module ccm-ldn-subsite  -  servlet mappings END  -->
 
diff --git a/ccm-bundle/bundles/devel/cfg/integration.properties b/ccm-bundle/bundles/devel/cfg/integration.properties
index 4f611efbf..067948bd0 100644
--- a/ccm-bundle/bundles/devel/cfg/integration.properties
+++ b/ccm-bundle/bundles/devel/cfg/integration.properties
@@ -42,7 +42,7 @@ com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCatego
 
 com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp
 com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
-com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver
+com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatcher.SubsiteItemTemplateResolver
 
 ; Configure dhtml editor for use in cms content-center
 ; Xinha is default and should work out of the box
@@ -96,10 +96,15 @@ com.arsdigita.forum.disable_page_caching=true
 
 
 # ccm-navigation application
+; com.arsdigita.navigation.category_menu_show_grand_children_min=1
+; com.arsdigita.navigation.category_menu_show_grand_children=adaptive
+; com.arsdigita.navigation.category_menu_show_grand_children_limit=1
+; com.arsdigita.navigation.category_menu_show_grand_children_max=65536
 com.arsdigita.navigation.category_menu_show_grand_children=false
+; com.arsdigita.navigation.category_menu_show_nephews=false
 com.arsdigita.navigation.default_cat_root_path=/navigation/
-com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/sci-default.jsp
-com.arsdigita.navigation.templates_file=bundle/navigation/sci-templates.txt
+com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/gen-default.jsp
+com.arsdigita.navigation.templates_file=bundle/navigation/gen-templates.txt
 
 
 # ccm-ldn-search application
@@ -107,7 +112,7 @@ com.arsdigita.london.search.show_sponsored_links=true
 
 
 # ccm-ldn-subsite application
-com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
 
 # ccm-themedirector application
@@ -117,21 +122,22 @@ themedirector.default_theme_path=themes/static/aplaws-generic
 themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl
 
 
-# ccm-sci-bundle (Loader only)
-#com.arsdigita.bundle.category_files=bundle/categories/sci-nav-domain-1.00.xml,bundle/categories/sci-nav-hierarchy-1.00.xml
-
+# ccm-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/
 # =============================================================================================
 # runtime specific configurations
 
-waf.admin.email=webmaster@scientificCMS.org
-waf.admin.name.given=SCI
+waf.admin.email=webmaster@openccm.org
+waf.admin.name.given=OpenCCM 
 waf.admin.name.family=Administrator
-waf.admin.password=sci2000
-waf.admin.password.question=12345
+waf.admin.password=WaeGgfsh
+waf.admin.password.question=12345 
 waf.admin.password.answer=6
 
-waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm-sci?user\=sci&password\=sci47web&stringtype\=unspecified
-waf.runtime.jdbc_pool_size=30
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/openccm?user\=ccm&password\=ccm42web
+waf.runtime.jdbc_pool_size=40
 
 waf.web.server=localhost\:8080
 
diff --git a/ccm-bundle/bundles/devel/cfg/project.xml b/ccm-bundle/bundles/devel/cfg/project.xml
index cbb03ed52..aae5c6c7f 100644
--- a/ccm-bundle/bundles/devel/cfg/project.xml
+++ b/ccm-bundle/bundles/devel/cfg/project.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!--  project.xml SCI devel - containing only modules used for ScientificCMS  -->
+<!--    project.xml - ccm - containing only those modules used for 
+                            CCM development                      -->
 
 <ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
                xmlns:ccm="http://ccm.redhat.com/ccm-project" 
               ccmVersion="6.1" 
-                    name="ScientificCMS" 
-              prettyName="Scientific CMS" 
-                 version="1-1-6" 
-                 release="devel" 
-                  webxml="web-sci.xml" 
+                    name="librecms-ccm" 
+              prettyName="LibreCMS OpenCCM" 
+                 version="0-0-0" 
+                 release="trunk-r1323" 
+                  webxml="web-ccm.xml" 
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
 
@@ -21,7 +22,7 @@
 <ccm:build>
 
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
-<!--    Scientific CMS set of CORE packages                                  -->
+<!--    LibreCMS set of CORE packages                                        -->
 <!--    NONE can be omitted for technical reasons / internal dependencies    -->
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 
@@ -41,24 +42,25 @@
 
 <!--   Applications   -->
         <ccm:application name="ccm-navigation"/>
+        <!-- ccm-portalworkspace depends on ccm-subsite  -->
         <ccm:application name="ccm-portalworkspace"/>
+        <ccm:application name="ccm-subsite"/>                    
         <ccm:application name="ccm-themedirector"/>
 
 <!--   LDN extension  -->
         <ccm:application name="ccm-ldn-search"/>
         <ccm:application name="ccm-ldn-shortcuts"/>
-        <ccm:application name="ccm-ldn-subsite"/>                    
         <ccm:application name="ccm-ldn-terms"/>
         <ccm:application name="ccm-ldn-util"/>
 
-<!--   SCI extension  -->
-        <ccm:application name="ccm-sci-bundle"/>
+<!--   LibreCMS bundle  -->
+        <ccm:application name="ccm-bundle"/>
 
 
 
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
-<!--    Scientific CMS  OPTIONAL packages                                    -->
-<!--    Various combinations of these packages make up specific editions     -->
+<!--    Libre CMS                                                            -->
+<!--    Set of packages which make up a specific site                        -->
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 
 <!--   Content Assets   -->
@@ -85,7 +87,7 @@
 
 
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
-<!--    Scientific CMS   potential ADD-ONS packages                          -->
+<!--    Libre CMS   potential ADD-ONS packages                               -->
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 
 <!--  CMS Content Types  -->
@@ -132,7 +134,7 @@
 
 
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
-<!--    Scientific CMS   list of OBSOLETE modules                            -->
+<!--    Libre CMS   list of OBSOLETE modules                                 -->
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 
 <!--   Content Types   -->
diff --git a/ccm-bundle/bundles/devel/cfg/web-sci.xml b/ccm-bundle/bundles/devel/cfg/web-sci.xml
index 5babaffe0..dc01134c3 100644
--- a/ccm-bundle/bundles/devel/cfg/web-sci.xml
+++ b/ccm-bundle/bundles/devel/cfg/web-sci.xml
@@ -4,8 +4,8 @@
     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
                version="2.4">
 
-  <display-name>Scientific CMS</display-name> 
-  <description>Content and Collaboration Management for Scientific Institutions</description>
+  <display-name>LibreCMS OpenCCM Site</display-name> 
+  <description>Community and Content Management</description>
 
   <!-- path and filename of the log4j user accessible config file
        WEB-INF/conf/log4j.properties is the built-in default value -->
@@ -17,14 +17,13 @@
 
   <!-- Require secure connection by redirect to host-port part
        of parameter waf.web.secure_server               
-       NOT USED with ZeS                                        
   <filter>
     <filter-name>secured</filter-name>
     <filter-class>com.arsdigita.web.SecureFilter</filter-class>
   </filter>
   -->
   <!-- Initialize Profiler timers
-       NOT USED with ZeS standard / production                                  
+       NOT USED with standard / production                                  
   <filter>
     <filter-name>profiler</filter-name>
     <filter-class>com.arsdigita.profiler.ProfilerFilter</filter-class>
@@ -38,7 +37,7 @@
 
   <filter>
     <filter-name>subsite</filter-name>
-    <filter-class>com.arsdigita.london.subsite.SubsiteFilter</filter-class>
+    <filter-class>com.arsdigita.subsite.SubsiteFilter</filter-class>
   </filter>
 
 <!--    NOT USED HERE
@@ -277,7 +276,7 @@
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-subsite</param-value>
+      <param-value>/templates/ccm-subsite</param-value>
     </init-param>
   </servlet>
   <!-- module ccm-ldn-subsite  -  servlet declarations END  -->
@@ -375,7 +374,7 @@
   <!-- module ccm-ldn-subsite  -  servlet mappings BEGIN  -->
   <servlet-mapping>
     <servlet-name>subsite-files</servlet-name>
-    <url-pattern>/ccm-ldn-subsite/files/*</url-pattern>
+    <url-pattern>/ccm-subsite/files/*</url-pattern>
   </servlet-mapping>
   <!-- module ccm-ldn-subsite  -  servlet mappings END  -->
 
diff --git a/ccm-bundle/src/ccm-bundle.load b/ccm-bundle/src/ccm-bundle.load
index 758485901..bdd4fdf2a 100644
--- a/ccm-bundle/src/ccm-bundle.load
+++ b/ccm-bundle/src/ccm-bundle.load
@@ -6,8 +6,8 @@
     <table name="cms_items"/>
     <initializer class="com.arsdigita.cms.Initializer"/>
     <initializer class="com.arsdigita.london.terms.Initializer"/>
-    <initializer class="com.arsdigita.london.subsite.Initializer"/>
     <initializer class="com.arsdigita.portalworkspace.Initializer"/>
+    <initializer class="com.arsdigita.subsite.Initializer"/>
     <initializer class="com.arsdigita.london.search.Initializer"/>
   </requires>
   <provides>
diff --git a/ccm-bundle/src/com/arsdigita/bundle/ui/HomepageWorkspaceSelectionModel.java b/ccm-bundle/src/com/arsdigita/bundle/ui/HomepageWorkspaceSelectionModel.java
index fc6fc5d57..fbc67a05a 100644
--- a/ccm-bundle/src/com/arsdigita/bundle/ui/HomepageWorkspaceSelectionModel.java
+++ b/ccm-bundle/src/com/arsdigita/bundle/ui/HomepageWorkspaceSelectionModel.java
@@ -31,7 +31,7 @@ import com.arsdigita.portalworkspace.Workspace;
 import com.arsdigita.portalworkspace.WorkspacePage;
 import com.arsdigita.portalworkspace.WorkspacePageCollection;
 
-import com.arsdigita.london.subsite.Subsite;
+import com.arsdigita.subsite.Subsite;
 
 import com.arsdigita.util.Assert;
 import com.arsdigita.util.UncheckedWrapperException;
diff --git a/ccm-sci-bundle/bundles/demo/cfg/integration.properties b/ccm-sci-bundle/bundles/demo/cfg/integration.properties
index c6bf6108d..fe24ee817 100644
--- a/ccm-sci-bundle/bundles/demo/cfg/integration.properties
+++ b/ccm-sci-bundle/bundles/demo/cfg/integration.properties
@@ -42,7 +42,7 @@ com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCatego
 
 com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp
 com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
-com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver
+com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatcher.SubsiteItemTemplateResolver
 
 ; Configure dhtml editor for use in cms content-center
 ; Xinha is default and should work out of the box
@@ -107,10 +107,10 @@ com.arsdigita.london.search.show_sponsored_links=true
 
 
 # ccm-ldn-subsite application
-com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
 
-# ccm-ldn-themedirector application
+# ccm-themedirector application
 themedirector.default_theme_context=
 # themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf
 themedirector.default_theme_path=themes/static/aplaws-generic
diff --git a/ccm-sci-bundle/bundles/demo/cfg/project.xml b/ccm-sci-bundle/bundles/demo/cfg/project.xml
index 75df5a621..1851e7cf2 100644
--- a/ccm-sci-bundle/bundles/demo/cfg/project.xml
+++ b/ccm-sci-bundle/bundles/demo/cfg/project.xml
@@ -36,13 +36,14 @@
 
 <!--   Applications   -->
         <ccm:application name="ccm-navigation"/>
+        <!-- ccm-portalworkspace depends on ccm-subsite  -->
         <ccm:application name="ccm-portalworkspace"/>
+        <ccm:application name="ccm-subsite"/>                    
         <ccm:application name="ccm-themedirector"/>
 
 <!--   LDN extension  -->
         <ccm:application name="ccm-ldn-search"/>
         <ccm:application name="ccm-ldn-shortcuts"/>
-        <ccm:application name="ccm-ldn-subsite"/>                    
         <ccm:application name="ccm-ldn-terms"/>
         <ccm:application name="ccm-ldn-util"/>
 
diff --git a/ccm-sci-bundle/bundles/demo/cfg/web-sci.xml b/ccm-sci-bundle/bundles/demo/cfg/web-sci.xml
index 5babaffe0..f7a457a8e 100644
--- a/ccm-sci-bundle/bundles/demo/cfg/web-sci.xml
+++ b/ccm-sci-bundle/bundles/demo/cfg/web-sci.xml
@@ -17,14 +17,13 @@
 
   <!-- Require secure connection by redirect to host-port part
        of parameter waf.web.secure_server               
-       NOT USED with ZeS                                        
   <filter>
     <filter-name>secured</filter-name>
     <filter-class>com.arsdigita.web.SecureFilter</filter-class>
   </filter>
   -->
   <!-- Initialize Profiler timers
-       NOT USED with ZeS standard / production                                  
+       NOT USED with standard / production                                  
   <filter>
     <filter-name>profiler</filter-name>
     <filter-class>com.arsdigita.profiler.ProfilerFilter</filter-class>
@@ -38,7 +37,7 @@
 
   <filter>
     <filter-name>subsite</filter-name>
-    <filter-class>com.arsdigita.london.subsite.SubsiteFilter</filter-class>
+    <filter-class>com.arsdigita.subsite.SubsiteFilter</filter-class>
   </filter>
 
 <!--    NOT USED HERE
@@ -277,7 +276,7 @@
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-subsite</param-value>
+      <param-value>/templates/ccm-subsite</param-value>
     </init-param>
   </servlet>
   <!-- module ccm-ldn-subsite  -  servlet declarations END  -->
@@ -375,7 +374,7 @@
   <!-- module ccm-ldn-subsite  -  servlet mappings BEGIN  -->
   <servlet-mapping>
     <servlet-name>subsite-files</servlet-name>
-    <url-pattern>/ccm-ldn-subsite/files/*</url-pattern>
+    <url-pattern>/ccm-subsite/files/*</url-pattern>
   </servlet-mapping>
   <!-- module ccm-ldn-subsite  -  servlet mappings END  -->
 
diff --git a/ccm-sci-bundle/bundles/devel/cfg/integration.properties b/ccm-sci-bundle/bundles/devel/cfg/integration.properties
index 7ad143bb0..811782df8 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/integration.properties
+++ b/ccm-sci-bundle/bundles/devel/cfg/integration.properties
@@ -42,7 +42,7 @@ com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCatego
 
 com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp
 com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
-com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver
+com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatcher.SubsiteItemTemplateResolver
 
 ; Configure dhtml editor for use in cms content-center
 ; Xinha is default and should work out of the box
@@ -107,10 +107,10 @@ com.arsdigita.london.search.show_sponsored_links=true
 
 
 # ccm-ldn-subsite application
-com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
 
-# ccm-ldn-themedirector application
+# ccm-themedirector application
 themedirector.default_theme_context=
 # themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf
 themedirector.default_theme_path=themes/static/aplaws-generic
diff --git a/ccm-sci-bundle/bundles/devel/cfg/project.xml b/ccm-sci-bundle/bundles/devel/cfg/project.xml
index 75df5a621..b778c4e3f 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/project.xml
+++ b/ccm-sci-bundle/bundles/devel/cfg/project.xml
@@ -36,13 +36,15 @@
 
 <!--   Applications   -->
         <ccm:application name="ccm-navigation"/>
+        <!-- ccm-portalworkspace depends on ccm-subsite  -->
         <ccm:application name="ccm-portalworkspace"/>
+        <ccm:application name="ccm-subsite"/>                    
+
         <ccm:application name="ccm-themedirector"/>
 
 <!--   LDN extension  -->
         <ccm:application name="ccm-ldn-search"/>
         <ccm:application name="ccm-ldn-shortcuts"/>
-        <ccm:application name="ccm-ldn-subsite"/>                    
         <ccm:application name="ccm-ldn-terms"/>
         <ccm:application name="ccm-ldn-util"/>
 
diff --git a/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml b/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml
index 5babaffe0..f7a457a8e 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml
+++ b/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml
@@ -17,14 +17,13 @@
 
   <!-- Require secure connection by redirect to host-port part
        of parameter waf.web.secure_server               
-       NOT USED with ZeS                                        
   <filter>
     <filter-name>secured</filter-name>
     <filter-class>com.arsdigita.web.SecureFilter</filter-class>
   </filter>
   -->
   <!-- Initialize Profiler timers
-       NOT USED with ZeS standard / production                                  
+       NOT USED with standard / production                                  
   <filter>
     <filter-name>profiler</filter-name>
     <filter-class>com.arsdigita.profiler.ProfilerFilter</filter-class>
@@ -38,7 +37,7 @@
 
   <filter>
     <filter-name>subsite</filter-name>
-    <filter-class>com.arsdigita.london.subsite.SubsiteFilter</filter-class>
+    <filter-class>com.arsdigita.subsite.SubsiteFilter</filter-class>
   </filter>
 
 <!--    NOT USED HERE
@@ -277,7 +276,7 @@
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-subsite</param-value>
+      <param-value>/templates/ccm-subsite</param-value>
     </init-param>
   </servlet>
   <!-- module ccm-ldn-subsite  -  servlet declarations END  -->
@@ -375,7 +374,7 @@
   <!-- module ccm-ldn-subsite  -  servlet mappings BEGIN  -->
   <servlet-mapping>
     <servlet-name>subsite-files</servlet-name>
-    <url-pattern>/ccm-ldn-subsite/files/*</url-pattern>
+    <url-pattern>/ccm-subsite/files/*</url-pattern>
   </servlet-mapping>
   <!-- module ccm-ldn-subsite  -  servlet mappings END  -->
 
diff --git a/ccm-sci-bundle/src/com/arsdigita/bundle/ui/HomepageWorkspaceSelectionModel.java b/ccm-sci-bundle/src/com/arsdigita/bundle/ui/HomepageWorkspaceSelectionModel.java
index fc6fc5d57..fbc67a05a 100644
--- a/ccm-sci-bundle/src/com/arsdigita/bundle/ui/HomepageWorkspaceSelectionModel.java
+++ b/ccm-sci-bundle/src/com/arsdigita/bundle/ui/HomepageWorkspaceSelectionModel.java
@@ -31,7 +31,7 @@ import com.arsdigita.portalworkspace.Workspace;
 import com.arsdigita.portalworkspace.WorkspacePage;
 import com.arsdigita.portalworkspace.WorkspacePageCollection;
 
-import com.arsdigita.london.subsite.Subsite;
+import com.arsdigita.subsite.Subsite;
 
 import com.arsdigita.util.Assert;
 import com.arsdigita.util.UncheckedWrapperException;