diff --git a/ccm-ldn-aplaws/web/templates/ccm-cms/content-section/default/aplaws-item.jsp b/ccm-ldn-aplaws/web/templates/ccm-cms/content-section/default/aplaws-item.jsp
index 017b1664e..48234f432 100644
--- a/ccm-ldn-aplaws/web/templates/ccm-cms/content-section/default/aplaws-item.jsp
+++ b/ccm-ldn-aplaws/web/templates/ccm-cms/content-section/default/aplaws-item.jsp
@@ -33,7 +33,7 @@
       classname="com.arsdigita.navigation.ui.RelatedItems"/>
 
     <define:component name="assignedTerms"
-      classname="com.arsdigita.bundle.ui.AssignedItemTerms"/>
+      classname="com.arsdigita.aplaws.ui.AssignedItemTerms"/>
   </define:page>
 
   <show:all/>
diff --git a/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-portal.jsp b/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-portal.jsp
index 06056aa8e..b82ec9b96 100644
--- a/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-portal.jsp
+++ b/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-portal.jsp
@@ -5,7 +5,7 @@
   version="1.2">
 
   <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+  <jsp:directive.page import="com.arsdigita.navigation.Navigation"/>
   <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
   <jsp:directive.page import="com.arsdigita.portalworkspace.ui.CategoryPortalSelectionModel"/>
 
@@ -22,11 +22,11 @@
     title="Navigation" cache="true">
 
     <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
+      classname="com.arsdigita.navigation.ui.category.Path"/>
     <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+      classname="com.arsdigita.navigation.ui.category.Menu"/>
     <define:component name="portalWorkspace"
-      classname="com.arsdigita.london.portal.ui.WorkspaceViewer"/>
+      classname="com.arsdigita.portalworkspace.ui.WorkspaceViewer"/>
     <jsp:scriptlet>
       ((com.arsdigita.portalworkspace.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel());
     </jsp:scriptlet>
diff --git a/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-services.jsp b/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-services.jsp
index f2822f8db..c026abcc6 100644
--- a/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-services.jsp
+++ b/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-services.jsp
@@ -6,9 +6,9 @@
 
   <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
   <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+  <jsp:directive.page import="com.arsdigita.navigation.Navigation"/>
+  <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionDefinition"/>
+  <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionRenderer"/>
 
   <jsp:scriptlet>
     long age = Navigation.getConfig().getIndexPageCacheLifetime();
@@ -23,25 +23,25 @@
     title="Navigation" cache="true">
 
     <define:component name="greetingItem"
-      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
+      classname="com.arsdigita.navigation.ui.GreetingItem"/>
     <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
+      classname="com.arsdigita.navigation.ui.category.Path"/>
     <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+      classname="com.arsdigita.navigation.ui.category.Menu"/>
     <define:component name="categoryTermDetails"
       classname="com.arsdigita.aplaws.ui.CategoryTermDetails"/>
     <define:component name="itemList"
-      classname="com.arsdigita.london.navigation.ui.object.AtoZObjectList"/>
+      classname="com.arsdigita.navigation.ui.object.AtoZObjectList"/>
     <jsp:scriptlet>
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
+      ((com.arsdigita.london.ui.object.AtoZObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.london.ui.object.AtoZObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.london.ui.object.AtoZObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
 
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setDescendCategories(false);      
+      ((com.arsdigita.london.ui.object.AtoZObjectList) itemList).getDefinition().setDescendCategories(false);      
       
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().setPageSize(30);
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute("objectType");
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "title");
+      ((com.arsdigita.london.ui.object.AtoZObjectList) itemList).getRenderer().setPageSize(30);
+      ((com.arsdigita.london.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.london.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "title");
     </jsp:scriptlet>
   </define:page>