diff --git a/ccm-bundle/web/themes/static/aplaws-generic/subsite-index.xsl b/ccm-bundle/web/themes/static/aplaws-generic/subsite-index.xsl
index cb04a688c..1a894e0f5 100644
--- a/ccm-bundle/web/themes/static/aplaws-generic/subsite-index.xsl
+++ b/ccm-bundle/web/themes/static/aplaws-generic/subsite-index.xsl
@@ -9,7 +9,7 @@
   -->
   <!-- path to xsl if installed in the main (common) web context   
   -->
-  <xsl:import href="../../../__ccm__/apps/subsite/xsl/index.xsl"/>
+  <xsl:import href="../../heirloom/apps/subsite/xsl/index.xsl"/>
 
   <xsl:import href="lib/page.xsl"/>
 
diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspaceSelectionModel.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspaceSelectionModel.java
index a3d439d50..723550239 100755
--- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspaceSelectionModel.java
+++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/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/src/ccm-sci-bundle.load b/ccm-sci-bundle/src/ccm-sci-bundle.load
index 758485901..c358fd8f0 100644
--- a/ccm-sci-bundle/src/ccm-sci-bundle.load
+++ b/ccm-sci-bundle/src/ccm-sci-bundle.load
@@ -5,10 +5,10 @@
     <initializer class="com.arsdigita.core.Initializer"/>
     <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"/>
+    <initializer class="com.arsdigita.london.terms.Initializer"/>
   </requires>
   <provides>
   <!--