diff --git a/source/java/org/alfresco/web/forms/AbstractRenderingEngine.java b/source/java/org/alfresco/web/forms/AbstractRenderingEngine.java
index d521049616..ffd64f02e1 100644
--- a/source/java/org/alfresco/web/forms/AbstractRenderingEngine.java
+++ b/source/java/org/alfresco/web/forms/AbstractRenderingEngine.java
@@ -18,7 +18,7 @@ package org.alfresco.web.forms;
 
 import javax.faces.context.FacesContext;
 import org.alfresco.model.WCMModel;
-import org.alfresco.repo.avm.AVMRemote;
+import org.alfresco.service.cmr.remote.AVMRemote;
 import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
diff --git a/source/java/org/alfresco/web/forms/FormDataFunctions.java b/source/java/org/alfresco/web/forms/FormDataFunctions.java
index 90629956e6..4bbfd5d783 100644
--- a/source/java/org/alfresco/web/forms/FormDataFunctions.java
+++ b/source/java/org/alfresco/web/forms/FormDataFunctions.java
@@ -17,11 +17,11 @@
 package org.alfresco.web.forms;
 
 import org.alfresco.model.WCMAppModel;
-import org.alfresco.repo.avm.AVMRemote;
-import org.alfresco.repo.avm.AVMRemoteInputStream;
 import org.alfresco.repo.domain.PropertyValue;
+import org.alfresco.repo.remote.AVMRemoteInputStream;
 import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
 import org.alfresco.service.cmr.avm.AVMNotFoundException;
+import org.alfresco.service.cmr.remote.AVMRemote;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.*;