diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/ContentList.java b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/ContentList.java
index 8c5b8b8af..e913b5737 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/ContentList.java
+++ b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/ContentList.java
@@ -25,7 +25,7 @@ import com.arsdigita.cms.ContentBundle;
 import com.arsdigita.cms.ContentItem;
 import com.arsdigita.cms.dispatcher.SimpleXMLGenerator;
 import com.arsdigita.dispatcher.DispatcherHelper;
-import com.arsdigita.domain.DomainObjectXMLRenderer;
+import com.arsdigita.cms.ContentItemXMLRenderer;
 import com.arsdigita.kernel.ACSObject;
 import com.arsdigita.persistence.OID;
 import com.arsdigita.xml.Element;
@@ -198,7 +198,7 @@ public class ContentList extends AbstractComponent {
         // output the XML
         ContentItem item;
         Element itemElement;
-        DomainObjectXMLRenderer renderer;
+        ContentItemXMLRenderer renderer;
         String itemIdString;
         Iterator classes = items.keySet().iterator();
         String className;
@@ -229,7 +229,7 @@ public class ContentList extends AbstractComponent {
                 itemElement.addAttribute("sortKey", ""+sortKeys.get(item.getID().toString()));
                 
                 
-                renderer = new DomainObjectXMLRenderer(itemElement);
+                renderer = new ContentItemXMLRenderer(itemElement);
                 // not sure these are necessary
                 renderer.setWrapAttributes(true);
                 renderer.setWrapRoot(false);
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/GreetingItem.java b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/GreetingItem.java
index db9119fea..f5d8710bb 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/GreetingItem.java
+++ b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/GreetingItem.java
@@ -26,9 +26,9 @@ import org.apache.log4j.Logger;
 import com.arsdigita.cms.CMS;
 import com.arsdigita.cms.ContentBundle;
 import com.arsdigita.cms.ContentItem;
+import com.arsdigita.cms.ContentItemXMLRenderer;
 import com.arsdigita.cms.SecurityManager;
 import com.arsdigita.cms.dispatcher.SimpleXMLGenerator;
-import com.arsdigita.domain.DomainObjectXMLRenderer;
 import com.arsdigita.kernel.Kernel;
 import com.arsdigita.kernel.Party;
 import com.arsdigita.kernel.permissions.PermissionDescriptor;
@@ -105,8 +105,8 @@ public class GreetingItem extends AbstractComponent {
         Element itemEl = content.newChildElement("cms:item",
                 CMS.CMS_XML_NS);
         
-        DomainObjectXMLRenderer renderer =
-                new DomainObjectXMLRenderer(itemEl);
+        ContentItemXMLRenderer renderer =
+                new ContentItemXMLRenderer(itemEl);
         
         renderer.setWrapAttributes( true );
         renderer.setWrapRoot( false );
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/NavigationRootIndexItem.java b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/NavigationRootIndexItem.java
index 197c7d6d2..3424c9833 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/NavigationRootIndexItem.java
+++ b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/NavigationRootIndexItem.java
@@ -21,10 +21,9 @@ package com.arsdigita.london.navigation.ui;
 import com.arsdigita.cms.CMS;
 import com.arsdigita.cms.ContentBundle;
 import com.arsdigita.cms.ContentItem;
+import com.arsdigita.cms.ContentItemXMLRenderer;
 import com.arsdigita.cms.dispatcher.SimpleXMLGenerator;
-import com.arsdigita.domain.DomainObjectXMLRenderer;
 import com.arsdigita.london.navigation.Navigation;
-import com.arsdigita.london.navigation.ui.AbstractComponent;
 import com.arsdigita.xml.Element;
 
 import javax.servlet.http.HttpServletRequest;
@@ -75,7 +74,7 @@ public class NavigationRootIndexItem extends AbstractComponent {
             }
             indexItem = indexItem.getLiveVersion();
             Element itemElement = parentElement.newChildElement(TAG_ITEM, CMS.CMS_XML_NS);
-            DomainObjectXMLRenderer renderer = new DomainObjectXMLRenderer(itemElement);
+            ContentItemXMLRenderer renderer = new ContentItemXMLRenderer(itemElement);
             // not sure these are necessary
             renderer.setWrapAttributes(true);
             renderer.setWrapRoot(false);
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/QuickLinks.java b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/QuickLinks.java
index 0b1e15ffd..30bbe3d41 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/QuickLinks.java
+++ b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/QuickLinks.java
@@ -23,7 +23,6 @@ import com.arsdigita.persistence.Filter;
 import com.arsdigita.persistence.FilterFactory;
 import com.arsdigita.persistence.SessionManager;
 import com.arsdigita.domain.DomainCollection;
-import com.arsdigita.domain.DomainObjectXMLRenderer;
 import com.arsdigita.kernel.ACSObject;
 import com.arsdigita.kernel.Kernel;
 import com.arsdigita.kernel.Party;
@@ -43,6 +42,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.arsdigita.categorization.Category;
+import com.arsdigita.cms.ContentItemXMLRenderer;
 
 public class QuickLinks extends AbstractComponent {
 
@@ -94,7 +94,7 @@ public class QuickLinks extends AbstractComponent {
         while (links.next()) {
             Element objEl = Navigation.newElement("quickLink");
 
-            DomainObjectXMLRenderer xr = new DomainObjectXMLRenderer(objEl);
+            ContentItemXMLRenderer xr = new ContentItemXMLRenderer(objEl);
             xr.setNamespace(Navigation.NAV_PREFIX,
                             Navigation.NAV_NS);
             xr.setWrapRoot(false);