diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-atoz.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/def-atoz.jsp
similarity index 100%
rename from ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-atoz.jsp
rename to ccm-navigation/web/templates/ccm-navigation/navigation/def-atoz.jsp
diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-events.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/def-events.jsp
similarity index 95%
rename from ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-events.jsp
rename to ccm-navigation/web/templates/ccm-navigation/navigation/def-events.jsp
index 2bb18eb19..2b68b9acf 100644
--- a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-events.jsp
+++ b/ccm-navigation/web/templates/ccm-navigation/navigation/def-events.jsp
@@ -26,6 +26,7 @@
       classname="com.arsdigita.navigation.ui.GreetingItem"/>
     <define:component name="categoryPath"
       classname="com.arsdigita.navigation.ui.category.Path"/>
+
     <define:component name="categoryMenu"
       classname="com.arsdigita.navigation.ui.category.Menu"/>
     // Menu for mobile (responsive) Version theme UniHB
@@ -55,8 +56,8 @@
                                                               now.get(java.util.GregorianCalendar.MONTH),
                                                               now.get(java.util.GregorianCalendar.DATE))).getTime();
       // Im Event-CT ist das Datum als SQL-Type Date eingetragen, die Uhrzeit aber als SQL-Typ timestamptz. Leider wird von ccm im letzten
-      // das Datum nicht gesetzt, so daß der Timestamp immer eine Uhrzeit am 1.1.1970 angibt. Das ist ziemlich bescheuert und macht hier
-      // diesen kompliezierten Vergleich notwendig. Sonst könnte man einfach mit dem aktuellen Timestamp vergleichen.
+      // das Datum nicht gesetzt, so daß der Timestamp immer eine Uhrzeit am 1.1.1970 angibt. Das ist ziemlich bescheuert und macht hier
+      // diesen kompliezierten Vergleich notwendig. Sonst könnte man einfach mit dem aktuellen Timestamp vergleichen.
       java.util.Date time  = (new java.util.GregorianCalendar(70,0,1, // this is 01.01.1970 - start of UNIX timestamp
                                                               now.get(java.util.GregorianCalendar.HOUR_OF_DAY),
                                                               now.get(java.util.GregorianCalendar.MINUTE),
diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-default.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/def-page.jsp
similarity index 82%
rename from ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-default.jsp
rename to ccm-navigation/web/templates/ccm-navigation/navigation/def-page.jsp
index 2883b0af3..cb28a8f2a 100644
--- a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-default.jsp
+++ b/ccm-navigation/web/templates/ccm-navigation/navigation/def-page.jsp
@@ -1,8 +1,18 @@
+<!--
+   The default content item page (index page) provided by ccm-navigation package.
+   Sites will probably use a customized index page. 
+   Set the actual in dex page to be used by parameter
+      com.arsdigita.london.navigation.default_template
+
+   ##Title: Default Content Items Page 
+   ##Descr: Navigation Index Page, ordering items in ascending order, manually adjustable
+   ##Path : /templates/ccm-navigation/navigation/def-page.jsp
+-->
 <jsp:root 
-    xmlns:jsp="http://java.sun.com/JSP/Page" 
-    xmlns:define="/WEB-INF/bebop-define.tld"
-    xmlns:show="/WEB-INF/bebop-show.tld"
-    version="1.2">
+  xmlns:jsp="http://java.sun.com/JSP/Page" 
+  xmlns:define="/WEB-INF/bebop-define.tld"
+  xmlns:show="/WEB-INF/bebop-show.tld"
+  version="1.2">
 
     <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
     <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
@@ -11,23 +21,26 @@
     <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionRenderer"/>
 
     <jsp:scriptlet>
-    long age = Navigation.getConfig().getIndexPageCacheLifetime();
-    if (age == 0) {
-      DispatcherHelper.cacheDisable(response);
-    } else {
-      DispatcherHelper.cacheForWorld(response, (int)age);
-    }
+      long age = Navigation.getConfig().getIndexPageCacheLifetime();
+      if (age == 0) {
+        DispatcherHelper.cacheDisable(response);
+      } else {
+        DispatcherHelper.cacheForWorld(response, (int)age);
+      }
     </jsp:scriptlet>
 
     <define:page name="defaultItemPage" application="navigation"
-                 title="Navigation" cache="true">
+        title="Navigation" cache="true">
 
         <define:component name="greetingItem"
                           classname="com.arsdigita.navigation.ui.GreetingItem"/>
+
         <define:component name="categoryPath"
                           classname="com.arsdigita.navigation.ui.category.Path"/>
+
         <define:component name="categoryMenu"
                           classname="com.arsdigita.navigation.ui.category.Menu"/>
+
         // Menu for mobile responsive version
         <define:component name="categoryNav"
                           classname="com.arsdigita.navigation.ui.category.Hierarchy">
@@ -38,6 +51,7 @@
 
         <define:component name="itemList"
                           classname="com.arsdigita.navigation.ui.object.SimpleObjectList"/>
+
         <jsp:scriptlet>
           ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
           ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
@@ -69,5 +83,5 @@
                           classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
 
     </define:page>
-    <show:all/>
+  <show:all/>
 </jsp:root>
diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal-welcome.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/def-portal-welcome.jsp
similarity index 78%
rename from ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal-welcome.jsp
rename to ccm-navigation/web/templates/ccm-navigation/navigation/def-portal-welcome.jsp
index 1056811e2..1e492730c 100644
--- a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal-welcome.jsp
+++ b/ccm-navigation/web/templates/ccm-navigation/navigation/def-portal-welcome.jsp
@@ -3,7 +3,14 @@
           xmlns:show="/WEB-INF/bebop-show.tld"
           version="1.2">
 
-    <!-- JSP template to use a portal page as index page in navigation  -->
+<!-- JSP template to use a portal page as index page in navigation  
+     Currently the same as def-portal.jsp, may change in future to
+     support special features of a site's start page (home page)      
+ 
+    ##Title: A Portal Page usable as Index Page in Navigation
+    ##Descr: Portal Page including navigation menu. Portlets must be added separately.
+    ##Path : /templates/ccm-navigation/navigation/def-portal-welcome.jsp
+-->
 
     <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
     <jsp:directive.page import="com.arsdigita.navigation.Navigation"/>
diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/def-portal.jsp
similarity index 72%
rename from ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal.jsp
rename to ccm-navigation/web/templates/ccm-navigation/navigation/def-portal.jsp
index 1056811e2..59354b12d 100644
--- a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal.jsp
+++ b/ccm-navigation/web/templates/ccm-navigation/navigation/def-portal.jsp
@@ -1,9 +1,16 @@
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" 
-          xmlns:define="/WEB-INF/bebop-define.tld"
-          xmlns:show="/WEB-INF/bebop-show.tld"
-          version="1.2">
+<jsp:root 
+     xmlns:jsp="http://java.sun.com/JSP/Page"
+  xmlns:define="/WEB-INF/bebop-define.tld"
+    xmlns:show="/WEB-INF/bebop-show.tld"
+       version="1.2">
 
-    <!-- JSP template to use a portal page as index page in navigation  -->
+<!-- JSP template to use a portal page as index page in navigation  
+     Currently the same as def-portal-welcome.jsp, may change in future.
+ 
+    ##Title: A Portal Page usable as Index Page in Navigation
+    ##Descr: A portal page including navigation menu. Portlets must be added separately.
+    ##Path : /templates/ccm-navigation/navigation/def-portal.jsp
+-->
 
     <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
     <jsp:directive.page import="com.arsdigita.navigation.Navigation"/>
diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-recent.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/def-recent.jsp
similarity index 100%
rename from ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-recent.jsp
rename to ccm-navigation/web/templates/ccm-navigation/navigation/def-recent.jsp
diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sitemap.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/def-sitemap.jsp
similarity index 79%
rename from ccm-sci-bundle/web/templates/ccm-navigation/navigation/sitemap.jsp
rename to ccm-navigation/web/templates/ccm-navigation/navigation/def-sitemap.jsp
index 2a614450e..5224219a4 100644
--- a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sitemap.jsp
+++ b/ccm-navigation/web/templates/ccm-navigation/navigation/def-sitemap.jsp
@@ -1,9 +1,16 @@
+<!--
+   Template to generate a sitemap. Page includes mavigation menu and
+   breadcrumps if available.
+
+   ##Title: Sitemap Page
+   ##Descr: Generates an overview about all navigation menu items.
+   ##Path : /templates/ccm-navigation/navigation/def-sitemap.jsp
+-->
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
        xmlns:define="/WEB-INF/bebop-define.tld" 
          xmlns:show="/WEB-INF/bebop-show.tld"
             version="1.2"> 
 
-<!--  Anpassung sitemap-Seite, die auch Navigationsspalte und Breadcrumbs enthaelt.   -->
 
   <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
 
diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/SpecializingList.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/def-specializing-list.jsp
similarity index 100%
rename from ccm-sci-bundle/web/templates/ccm-navigation/navigation/SpecializingList.jsp
rename to ccm-navigation/web/templates/ccm-navigation/navigation/def-specializing-list.jsp
diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-welcome.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/def-welcome.jsp
similarity index 97%
rename from ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-welcome.jsp
rename to ccm-navigation/web/templates/ccm-navigation/navigation/def-welcome.jsp
index 69efafe9b..730d18267 100644
--- a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-welcome.jsp
+++ b/ccm-navigation/web/templates/ccm-navigation/navigation/def-welcome.jsp
@@ -1,10 +1,10 @@
 <jsp:root 
-    xmlns:jsp="http://java.sun.com/JSP/Page" 
-    xmlns:define="/WEB-INF/bebop-define.tld"
+     xmlns:jsp="http://java.sun.com/JSP/Page"
+  xmlns:define="/WEB-INF/bebop-define.tld"
     xmlns:show="/WEB-INF/bebop-show.tld"
-    version="1.2">
+       version="1.2">
 
-    <!-- JSP template for the welcome / start page using navigation -->
+  <!-- JSP template for the welcome / start page using navigation -->
 
     <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
     <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
@@ -20,6 +20,7 @@
     } else {
       DispatcherHelper.cacheForWorld(response, (int)age);
     }
+    int maxItems = Navigation.getConfig().getIndexPageMaxItems();
     </jsp:scriptlet>
 
     <define:page name="defaultItemPage" 
@@ -54,7 +55,7 @@
             ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);      
             ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
       
-            ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30);
+            ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(maxItems);
             ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
             ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
             ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "definition");
diff --git a/ccm-navigation/web/templates/ccm-navigation/navigation/nav-atoz.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/min-atoz.jsp
similarity index 100%
rename from ccm-navigation/web/templates/ccm-navigation/navigation/nav-atoz.jsp
rename to ccm-navigation/web/templates/ccm-navigation/navigation/min-atoz.jsp
diff --git a/ccm-navigation/web/templates/ccm-navigation/navigation/nav-default.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/min-default.jsp
similarity index 94%
rename from ccm-navigation/web/templates/ccm-navigation/navigation/nav-default.jsp
rename to ccm-navigation/web/templates/ccm-navigation/navigation/min-default.jsp
index 8b5fad7f3..49d83dda3 100755
--- a/ccm-navigation/web/templates/ccm-navigation/navigation/nav-default.jsp
+++ b/ccm-navigation/web/templates/ccm-navigation/navigation/min-default.jsp
@@ -1,12 +1,12 @@
 <!--
-   A default item page (index page) provided by ccm-navigation package. Sites
-   will probably use a customized index page. 
+   A minimal default item page (index page) provided by ccm-navigation package.
+   Sites will probably use a customized index page. 
    Set the actual in dex page to be used by parameter
       com.arsdigita.london.navigation.default_template
 
-   ##Title: Default Items Page
+   ##Title: Default Items Page (minimal functionality)
    ##Descr: Default Navigation Index Page, ordering items in ascending order
-   ##Path : /templates/ccm-navigation/navigation/nav-default.jsp
+   ##Path : /templates/ccm-navigation/navigation/min-default.jsp
 -->
 <jsp:root 
   xmlns:jsp="http://java.sun.com/JSP/Page" 
diff --git a/ccm-navigation/web/templates/ccm-navigation/navigation/nav-recent.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/min-recent.jsp
similarity index 100%
rename from ccm-navigation/web/templates/ccm-navigation/navigation/nav-recent.jsp
rename to ccm-navigation/web/templates/ccm-navigation/navigation/min-recent.jsp
diff --git a/ccm-navigation/web/templates/ccm-navigation/navigation/nav-demo.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/nav-demo.jsp
index 535d300b2..6824c8c04 100755
--- a/ccm-navigation/web/templates/ccm-navigation/navigation/nav-demo.jsp
+++ b/ccm-navigation/web/templates/ccm-navigation/navigation/nav-demo.jsp
@@ -1,3 +1,10 @@
+<!--
+   Template to generate a sitemap page
+
+   ##Title: Sitemap Page
+   ##Descr: Same as def-sitemap, for backwards compatibility. To be deleted soon.
+   ##Path : /templates/ccm-navigation/navigation/min-default.jsp
+-->
 <jsp:root 
   xmlns:jsp="http://java.sun.com/JSP/Page" 
   xmlns:define="/WEB-INF/bebop-define.tld"
diff --git a/ccm-navigation/web/templates/ccm-navigation/navigation/sitemap.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/sitemap.jsp
new file mode 100644
index 000000000..7dd34fa7a
--- /dev/null
+++ b/ccm-navigation/web/templates/ccm-navigation/navigation/sitemap.jsp
@@ -0,0 +1,46 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+       xmlns:define="/WEB-INF/bebop-define.tld" 
+         xmlns:show="/WEB-INF/bebop-show.tld"
+            version="1.2"> 
+
+<!--
+   Template to generate a sitemap page, Page includes mavigation mene and
+   breadcrump if available.
+
+   Same as def-sitemap.jsp, for backwards compatibility. Will be removed in the
+   next version.
+
+   ##Title: Sitemap Page
+   ##Descr: Generates an overview about all navigation menu items. Backwards compatibel. Don't use for new installations.
+   ##Path : /templates/ccm-navigation/navigation/def-sitemap.jsp
+-->
+
+  <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+
+  <jsp:scriptlet>
+    DispatcherHelper.cacheForWorld( response );
+  </jsp:scriptlet>
+
+  <define:page name="sitemapPage" application="navigation"
+    title="APLAWS" cache="true">
+
+    <jsp:scriptlet>
+      sitemapPage.setClassAttr("sitemapPage");
+    </jsp:scriptlet>
+
+    <define:component name="categoryPath"
+      classname="com.arsdigita.navigation.ui.category.Path"/>
+    <define:component name="categoryMenu"
+      classname="com.arsdigita.navigation.ui.category.Menu"/>
+    <define:component name="categoryNav"
+                      classname="com.arsdigita.navigation.ui.category.Hierarchy">
+      <jsp:scriptlet>
+        ((com.arsdigita.navigation.ui.category.Hierarchy) categoryNav).setShowItems(false);
+      </jsp:scriptlet>
+    </define:component>
+
+  </define:page>
+
+  <show:all/>
+
+</jsp:root>
diff --git a/ccm-sci-bundle/bundles/base/cfg/integration.properties b/ccm-sci-bundle/bundles/base/cfg/integration.properties
index 2210abe90..cdd87b86c 100644
--- a/ccm-sci-bundle/bundles/base/cfg/integration.properties
+++ b/ccm-sci-bundle/bundles/base/cfg/integration.properties
@@ -175,7 +175,7 @@ com.arsdigita.forum.use_wysiwyg_editor=true
 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.default_template=/templates/ccm-navigation/navigation/def-page.jsp
 com.arsdigita.navigation.templates_file=bundle/navigation/sci-templates.txt
 
 
diff --git a/ccm-sci-bundle/bundles/base/res/bundle/navigation/sci-templates.txt b/ccm-sci-bundle/bundles/base/res/bundle/navigation/sci-templates.txt
index 008184981..c5049d23f 100755
--- a/ccm-sci-bundle/bundles/base/res/bundle/navigation/sci-templates.txt
+++ b/ccm-sci-bundle/bundles/base/res/bundle/navigation/sci-templates.txt
@@ -1,9 +1,10 @@
-ScientificCMS Default Items Page,Sci Default Navigation Index Page ordering items in ascending order,/templates/ccm-navigation/navigation/sci-default.jsp
-ScientificCMS Recent Items Page,Sci List of items ordered with most recent first,/templates/ccm-navigation/navigation/sci-recent.jsp
-ScientificCMS A-Z Items,Sci List of items paginated as A-Z,/templates/ccm-navigation/navigation/sci-atoz.jsp
-ScientificCMS Events Page,Sci Events Page ordering events in ??? order,/templates/ccm-navigation/navigation/sci-events.jsp
-ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-navigation/navigation/sci-portal.jsp
-ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-navigation/navigation/sci-portal-welcome.jsp
-ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-navigation/navigation/sci-welcome.jsp
-ScientificCMS Specializing Items List,Sci Specialising List item page,/templates/ccm-navigation/navigation/SpecializingList.jsp
-ScientificCMS Publications List,Sci publications listing page,/templates/ccm-navigation/navigation/SciPublicationList.jsp
+ScientificCMS Default Items Page,Sci Default Navigation Index Page ordering items in ascending order,/templates/ccm-navigation/navigation/def-page.jsp
+ScientificCMS Recent Items Page,Sci List of items ordered with most recent first,/templates/ccm-navigation/navigation/def-recent.jsp
+ScientificCMS A-Z Items,Sci List of items paginated as A-Z,/templates/ccm-navigation/navigation/def-atoz.jsp
+ScientificCMS Events Page,Sci Events Page ordering events in ??? order,/templates/ccm-navigation/navigation/def-events.jsp
+ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-navigation/navigation/def-portal.jsp
+ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-navigation/navigation/def-portal-welcome.jsp
+ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-navigation/navigation/def-welcome.jsp
+ScientificCMS Specializing Items List,Sci Specialising List item page,/templates/ccm-navigation/navigation/def-specializing-list.jsp
+ScientificCMS Publications List,Sci publications listing page,/templates/ccm-navigation/navigation/sci-publicationList.jsp
+ScientificCMS Institut Project List,Sci project listing page,/templates/ccm-navigation/navigation/sci-institute-projectlist.jsp
diff --git a/ccm-sci-bundle/bundles/base/templates/placeholder.info b/ccm-sci-bundle/bundles/base/templates/placeholder.info
index 1f4cf6df4..f304c4c14 100644
--- a/ccm-sci-bundle/bundles/base/templates/placeholder.info
+++ b/ccm-sci-bundle/bundles/base/templates/placeholder.info
@@ -13,4 +13,7 @@ provide a customised template.txt file replacing the default file
    /src/WEB-INF/navigation/templates.txt
 This file must be specified in parameter 
    com.arsdigita.navigation.templates_file
-It is usually stored in res/bundle/navigation
\ No newline at end of file
+It is usually stored in res/bundle/navigation
+
+Please use a unique prefix for additional template files, e.g. my-defaultpage.jsp
+and don't forget to add a usage comment.
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/demo/cfg/integration.properties b/ccm-sci-bundle/bundles/demo/cfg/integration.properties
index c1c5eb389..cc8124857 100644
--- a/ccm-sci-bundle/bundles/demo/cfg/integration.properties
+++ b/ccm-sci-bundle/bundles/demo/cfg/integration.properties
@@ -175,7 +175,7 @@ com.arsdigita.forum.use_wysiwyg_editor=true
 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.default_template=/templates/ccm-navigation/navigation/def-page.jsp
 com.arsdigita.navigation.templates_file=bundle/navigation/sci-templates.txt
 
 
diff --git a/ccm-sci-bundle/bundles/demo/res/bundle/navigation/sci-templates.txt b/ccm-sci-bundle/bundles/demo/res/bundle/navigation/sci-templates.txt
index 008184981..c5049d23f 100755
--- a/ccm-sci-bundle/bundles/demo/res/bundle/navigation/sci-templates.txt
+++ b/ccm-sci-bundle/bundles/demo/res/bundle/navigation/sci-templates.txt
@@ -1,9 +1,10 @@
-ScientificCMS Default Items Page,Sci Default Navigation Index Page ordering items in ascending order,/templates/ccm-navigation/navigation/sci-default.jsp
-ScientificCMS Recent Items Page,Sci List of items ordered with most recent first,/templates/ccm-navigation/navigation/sci-recent.jsp
-ScientificCMS A-Z Items,Sci List of items paginated as A-Z,/templates/ccm-navigation/navigation/sci-atoz.jsp
-ScientificCMS Events Page,Sci Events Page ordering events in ??? order,/templates/ccm-navigation/navigation/sci-events.jsp
-ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-navigation/navigation/sci-portal.jsp
-ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-navigation/navigation/sci-portal-welcome.jsp
-ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-navigation/navigation/sci-welcome.jsp
-ScientificCMS Specializing Items List,Sci Specialising List item page,/templates/ccm-navigation/navigation/SpecializingList.jsp
-ScientificCMS Publications List,Sci publications listing page,/templates/ccm-navigation/navigation/SciPublicationList.jsp
+ScientificCMS Default Items Page,Sci Default Navigation Index Page ordering items in ascending order,/templates/ccm-navigation/navigation/def-page.jsp
+ScientificCMS Recent Items Page,Sci List of items ordered with most recent first,/templates/ccm-navigation/navigation/def-recent.jsp
+ScientificCMS A-Z Items,Sci List of items paginated as A-Z,/templates/ccm-navigation/navigation/def-atoz.jsp
+ScientificCMS Events Page,Sci Events Page ordering events in ??? order,/templates/ccm-navigation/navigation/def-events.jsp
+ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-navigation/navigation/def-portal.jsp
+ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-navigation/navigation/def-portal-welcome.jsp
+ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-navigation/navigation/def-welcome.jsp
+ScientificCMS Specializing Items List,Sci Specialising List item page,/templates/ccm-navigation/navigation/def-specializing-list.jsp
+ScientificCMS Publications List,Sci publications listing page,/templates/ccm-navigation/navigation/sci-publicationList.jsp
+ScientificCMS Institut Project List,Sci project listing page,/templates/ccm-navigation/navigation/sci-institute-projectlist.jsp
diff --git a/ccm-sci-bundle/bundles/demo/templates/placeholder.info b/ccm-sci-bundle/bundles/demo/templates/placeholder.info
index 165928284..f304c4c14 100644
--- a/ccm-sci-bundle/bundles/demo/templates/placeholder.info
+++ b/ccm-sci-bundle/bundles/demo/templates/placeholder.info
@@ -13,4 +13,7 @@ provide a customised template.txt file replacing the default file
    /src/WEB-INF/navigation/templates.txt
 This file must be specified in parameter 
    com.arsdigita.navigation.templates_file
-It usually stored in res/bundle/navigation
\ No newline at end of file
+It is usually stored in res/bundle/navigation
+
+Please use a unique prefix for additional template files, e.g. my-defaultpage.jsp
+and don't forget to add a usage comment.
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/devel/cfg/integration.properties b/ccm-sci-bundle/bundles/devel/cfg/integration.properties
index b0f2e98cf..a53a5cb9f 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/integration.properties
+++ b/ccm-sci-bundle/bundles/devel/cfg/integration.properties
@@ -185,7 +185,7 @@ com.arsdigita.forum.use_wysiwyg_editor=true
 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.default_template=/templates/ccm-navigation/navigation/def-page.jsp
 ; uncomment the following line and edit the file to use a custom set of templates.
 com.arsdigita.navigation.templates_file=bundle/navigation/sci-templates.txt
 
diff --git a/ccm-sci-bundle/bundles/devel/res/bundle/navigation/sci-templates.txt b/ccm-sci-bundle/bundles/devel/res/bundle/navigation/sci-templates.txt
index 008184981..c5049d23f 100755
--- a/ccm-sci-bundle/bundles/devel/res/bundle/navigation/sci-templates.txt
+++ b/ccm-sci-bundle/bundles/devel/res/bundle/navigation/sci-templates.txt
@@ -1,9 +1,10 @@
-ScientificCMS Default Items Page,Sci Default Navigation Index Page ordering items in ascending order,/templates/ccm-navigation/navigation/sci-default.jsp
-ScientificCMS Recent Items Page,Sci List of items ordered with most recent first,/templates/ccm-navigation/navigation/sci-recent.jsp
-ScientificCMS A-Z Items,Sci List of items paginated as A-Z,/templates/ccm-navigation/navigation/sci-atoz.jsp
-ScientificCMS Events Page,Sci Events Page ordering events in ??? order,/templates/ccm-navigation/navigation/sci-events.jsp
-ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-navigation/navigation/sci-portal.jsp
-ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-navigation/navigation/sci-portal-welcome.jsp
-ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-navigation/navigation/sci-welcome.jsp
-ScientificCMS Specializing Items List,Sci Specialising List item page,/templates/ccm-navigation/navigation/SpecializingList.jsp
-ScientificCMS Publications List,Sci publications listing page,/templates/ccm-navigation/navigation/SciPublicationList.jsp
+ScientificCMS Default Items Page,Sci Default Navigation Index Page ordering items in ascending order,/templates/ccm-navigation/navigation/def-page.jsp
+ScientificCMS Recent Items Page,Sci List of items ordered with most recent first,/templates/ccm-navigation/navigation/def-recent.jsp
+ScientificCMS A-Z Items,Sci List of items paginated as A-Z,/templates/ccm-navigation/navigation/def-atoz.jsp
+ScientificCMS Events Page,Sci Events Page ordering events in ??? order,/templates/ccm-navigation/navigation/def-events.jsp
+ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-navigation/navigation/def-portal.jsp
+ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-navigation/navigation/def-portal-welcome.jsp
+ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-navigation/navigation/def-welcome.jsp
+ScientificCMS Specializing Items List,Sci Specialising List item page,/templates/ccm-navigation/navigation/def-specializing-list.jsp
+ScientificCMS Publications List,Sci publications listing page,/templates/ccm-navigation/navigation/sci-publicationList.jsp
+ScientificCMS Institut Project List,Sci project listing page,/templates/ccm-navigation/navigation/sci-institute-projectlist.jsp
diff --git a/ccm-sci-bundle/bundles/devel/templates/placeholder.info b/ccm-sci-bundle/bundles/devel/templates/placeholder.info
index 165928284..f304c4c14 100644
--- a/ccm-sci-bundle/bundles/devel/templates/placeholder.info
+++ b/ccm-sci-bundle/bundles/devel/templates/placeholder.info
@@ -13,4 +13,7 @@ provide a customised template.txt file replacing the default file
    /src/WEB-INF/navigation/templates.txt
 This file must be specified in parameter 
    com.arsdigita.navigation.templates_file
-It usually stored in res/bundle/navigation
\ No newline at end of file
+It is usually stored in res/bundle/navigation
+
+Please use a unique prefix for additional template files, e.g. my-defaultpage.jsp
+and don't forget to add a usage comment.
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/extended/res/bundle/navigation/sci-templates.txt b/ccm-sci-bundle/bundles/extended/res/bundle/navigation/sci-templates.txt
index 008184981..c5049d23f 100755
--- a/ccm-sci-bundle/bundles/extended/res/bundle/navigation/sci-templates.txt
+++ b/ccm-sci-bundle/bundles/extended/res/bundle/navigation/sci-templates.txt
@@ -1,9 +1,10 @@
-ScientificCMS Default Items Page,Sci Default Navigation Index Page ordering items in ascending order,/templates/ccm-navigation/navigation/sci-default.jsp
-ScientificCMS Recent Items Page,Sci List of items ordered with most recent first,/templates/ccm-navigation/navigation/sci-recent.jsp
-ScientificCMS A-Z Items,Sci List of items paginated as A-Z,/templates/ccm-navigation/navigation/sci-atoz.jsp
-ScientificCMS Events Page,Sci Events Page ordering events in ??? order,/templates/ccm-navigation/navigation/sci-events.jsp
-ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-navigation/navigation/sci-portal.jsp
-ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-navigation/navigation/sci-portal-welcome.jsp
-ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-navigation/navigation/sci-welcome.jsp
-ScientificCMS Specializing Items List,Sci Specialising List item page,/templates/ccm-navigation/navigation/SpecializingList.jsp
-ScientificCMS Publications List,Sci publications listing page,/templates/ccm-navigation/navigation/SciPublicationList.jsp
+ScientificCMS Default Items Page,Sci Default Navigation Index Page ordering items in ascending order,/templates/ccm-navigation/navigation/def-page.jsp
+ScientificCMS Recent Items Page,Sci List of items ordered with most recent first,/templates/ccm-navigation/navigation/def-recent.jsp
+ScientificCMS A-Z Items,Sci List of items paginated as A-Z,/templates/ccm-navigation/navigation/def-atoz.jsp
+ScientificCMS Events Page,Sci Events Page ordering events in ??? order,/templates/ccm-navigation/navigation/def-events.jsp
+ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-navigation/navigation/def-portal.jsp
+ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-navigation/navigation/def-portal-welcome.jsp
+ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-navigation/navigation/def-welcome.jsp
+ScientificCMS Specializing Items List,Sci Specialising List item page,/templates/ccm-navigation/navigation/def-specializing-list.jsp
+ScientificCMS Publications List,Sci publications listing page,/templates/ccm-navigation/navigation/sci-publicationList.jsp
+ScientificCMS Institut Project List,Sci project listing page,/templates/ccm-navigation/navigation/sci-institute-projectlist.jsp
diff --git a/ccm-sci-bundle/bundles/extended/templates/placeholder.info b/ccm-sci-bundle/bundles/extended/templates/placeholder.info
index 165928284..f304c4c14 100644
--- a/ccm-sci-bundle/bundles/extended/templates/placeholder.info
+++ b/ccm-sci-bundle/bundles/extended/templates/placeholder.info
@@ -13,4 +13,7 @@ provide a customised template.txt file replacing the default file
    /src/WEB-INF/navigation/templates.txt
 This file must be specified in parameter 
    com.arsdigita.navigation.templates_file
-It usually stored in res/bundle/navigation
\ No newline at end of file
+It is usually stored in res/bundle/navigation
+
+Please use a unique prefix for additional template files, e.g. my-defaultpage.jsp
+and don't forget to add a usage comment.
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/standard/cfg/integration.properties b/ccm-sci-bundle/bundles/standard/cfg/integration.properties
index 9d5f424f7..035696e48 100644
--- a/ccm-sci-bundle/bundles/standard/cfg/integration.properties
+++ b/ccm-sci-bundle/bundles/standard/cfg/integration.properties
@@ -175,7 +175,7 @@ com.arsdigita.forum.use_wysiwyg_editor=true
 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.default_template=/templates/ccm-navigation/navigation/def-page.jsp
 com.arsdigita.navigation.templates_file=bundle/navigation/sci-templates.txt
 
 
diff --git a/ccm-sci-bundle/bundles/standard/cfg/project.xml b/ccm-sci-bundle/bundles/standard/cfg/project.xml
index 9a1722b09..b5d523e81 100644
--- a/ccm-sci-bundle/bundles/standard/cfg/project.xml
+++ b/ccm-sci-bundle/bundles/standard/cfg/project.xml
@@ -114,7 +114,6 @@
         <ccm:application name="ccm-cms-types-job"/>
         <ccm:application name="ccm-cms-types-legalnotice"/>
         <ccm:application name="ccm-cms-types-minutes"/>
-        <ccm:application name="ccm-cms-types-organization"/>
         <ccm:application name="ccm-cms-types-pressrelease"/>
         <ccm:application name="ccm-cms-types-service"/>
         <ccm:application name="ccm-cms-types-siteproxy"/>
diff --git a/ccm-sci-bundle/bundles/standard/res/bundle/navigation/sci-templates.txt b/ccm-sci-bundle/bundles/standard/res/bundle/navigation/sci-templates.txt
index 008184981..c5049d23f 100755
--- a/ccm-sci-bundle/bundles/standard/res/bundle/navigation/sci-templates.txt
+++ b/ccm-sci-bundle/bundles/standard/res/bundle/navigation/sci-templates.txt
@@ -1,9 +1,10 @@
-ScientificCMS Default Items Page,Sci Default Navigation Index Page ordering items in ascending order,/templates/ccm-navigation/navigation/sci-default.jsp
-ScientificCMS Recent Items Page,Sci List of items ordered with most recent first,/templates/ccm-navigation/navigation/sci-recent.jsp
-ScientificCMS A-Z Items,Sci List of items paginated as A-Z,/templates/ccm-navigation/navigation/sci-atoz.jsp
-ScientificCMS Events Page,Sci Events Page ordering events in ??? order,/templates/ccm-navigation/navigation/sci-events.jsp
-ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-navigation/navigation/sci-portal.jsp
-ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-navigation/navigation/sci-portal-welcome.jsp
-ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-navigation/navigation/sci-welcome.jsp
-ScientificCMS Specializing Items List,Sci Specialising List item page,/templates/ccm-navigation/navigation/SpecializingList.jsp
-ScientificCMS Publications List,Sci publications listing page,/templates/ccm-navigation/navigation/SciPublicationList.jsp
+ScientificCMS Default Items Page,Sci Default Navigation Index Page ordering items in ascending order,/templates/ccm-navigation/navigation/def-page.jsp
+ScientificCMS Recent Items Page,Sci List of items ordered with most recent first,/templates/ccm-navigation/navigation/def-recent.jsp
+ScientificCMS A-Z Items,Sci List of items paginated as A-Z,/templates/ccm-navigation/navigation/def-atoz.jsp
+ScientificCMS Events Page,Sci Events Page ordering events in ??? order,/templates/ccm-navigation/navigation/def-events.jsp
+ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-navigation/navigation/def-portal.jsp
+ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-navigation/navigation/def-portal-welcome.jsp
+ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-navigation/navigation/def-welcome.jsp
+ScientificCMS Specializing Items List,Sci Specialising List item page,/templates/ccm-navigation/navigation/def-specializing-list.jsp
+ScientificCMS Publications List,Sci publications listing page,/templates/ccm-navigation/navigation/sci-publicationList.jsp
+ScientificCMS Institut Project List,Sci project listing page,/templates/ccm-navigation/navigation/sci-institute-projectlist.jsp
diff --git a/ccm-sci-bundle/bundles/standard/templates/placeholder.info b/ccm-sci-bundle/bundles/standard/templates/placeholder.info
index 165928284..f304c4c14 100644
--- a/ccm-sci-bundle/bundles/standard/templates/placeholder.info
+++ b/ccm-sci-bundle/bundles/standard/templates/placeholder.info
@@ -13,4 +13,7 @@ provide a customised template.txt file replacing the default file
    /src/WEB-INF/navigation/templates.txt
 This file must be specified in parameter 
    com.arsdigita.navigation.templates_file
-It usually stored in res/bundle/navigation
\ No newline at end of file
+It is usually stored in res/bundle/navigation
+
+Please use a unique prefix for additional template files, e.g. my-defaultpage.jsp
+and don't forget to add a usage comment.
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/Sci-README b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/SCI-README
similarity index 75%
rename from ccm-sci-bundle/web/templates/ccm-navigation/navigation/Sci-README
rename to ccm-sci-bundle/web/templates/ccm-navigation/navigation/SCI-README
index 034e7065c..3116fb9d7 100644
--- a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/Sci-README
+++ b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/SCI-README
@@ -6,4 +6,8 @@ Scientific CMS. The are activated by a customized template.txt file list.
 These file may be overwritten or ammended by site specific templates stored
 in den bundles subdirectory. In case of additional templates a customised
 template.txt must be provided and activated in the integrations.properties
-configuration file.  
\ No newline at end of file
+configuration file. 
+
+Naming Convention
+Please, use "sci-" to prefix the name of any added jsp and ensure to include
+the usage comment! 
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/institute-projectlist.jsp b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-institute-projectlist.jsp
similarity index 100%
rename from ccm-sci-bundle/web/templates/ccm-navigation/navigation/institute-projectlist.jsp
rename to ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-institute-projectlist.jsp
diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/SciPublicationList.jsp b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-publicationList.jsp
similarity index 100%
rename from ccm-sci-bundle/web/templates/ccm-navigation/navigation/SciPublicationList.jsp
rename to ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-publicationList.jsp