diff --git a/source/java/org/alfresco/web/bean/actions/handlers/CopyToWebProjectHandler.java b/source/java/org/alfresco/web/bean/actions/handlers/CopyToWebProjectHandler.java
index f4835b365a..2bdde14615 100644
--- a/source/java/org/alfresco/web/bean/actions/handlers/CopyToWebProjectHandler.java
+++ b/source/java/org/alfresco/web/bean/actions/handlers/CopyToWebProjectHandler.java
@@ -100,7 +100,7 @@ public class CopyToWebProjectHandler extends BaseActionHandler
          folder = avmPath.substring(avmPath.indexOf(AVMUtil.DIR_ROOT)+4);
          
          // get the destination web project name
-         NodeRef webProjectNode = Repository.getServiceRegistry(context).getWebProjectService().findWebProjectNodeFromPath(avmPath);
+         NodeRef webProjectNode = Repository.getServiceRegistry(context).getWebProjectService().getWebProjectNodeFromPath(avmPath);
          webProject = Repository.getNameForNode(
                   Repository.getServiceRegistry(context).getNodeService(), webProjectNode);
       }
diff --git a/source/java/org/alfresco/web/bean/wcm/ManageChangeRequestTaskDialog.java b/source/java/org/alfresco/web/bean/wcm/ManageChangeRequestTaskDialog.java
index 4eabd75779..89ba1af968 100644
--- a/source/java/org/alfresco/web/bean/wcm/ManageChangeRequestTaskDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/ManageChangeRequestTaskDialog.java
@@ -35,7 +35,6 @@ import javax.transaction.UserTransaction;
 
 import org.alfresco.model.WCMModel;
 import org.alfresco.repo.avm.AVMNodeConverter;
-import org.alfresco.wcm.sandbox.SandboxConstants;
 import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
 import org.alfresco.service.cmr.avm.locking.AVMLock;
 import org.alfresco.service.cmr.avm.locking.AVMLockingService;
@@ -43,6 +42,7 @@ import org.alfresco.service.cmr.avmsync.AVMDifference;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.Pair;
+import org.alfresco.wcm.util.WCMUtil;
 import org.alfresco.web.app.AlfrescoNavigationHandler;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.repository.Repository;
@@ -267,9 +267,7 @@ public class ManageChangeRequestTaskDialog extends ManageTaskDialog
                this.workflowPackage, WCMModel.PROP_AVM_DIR_INDIRECTION);
       String userStoreAvmPath = AVMNodeConverter.ToAVMVersionPath(userStoreNodeRef).getSecond();
       String userStoreName = AVMUtil.getStoreName(userStoreAvmPath);
-      String stagingStoreName = this.getAvmService().getStoreProperty(userStoreName, 
-               SandboxConstants.PROP_WEBSITE_NAME).getStringValue();
-      NodeRef webProjectRef = getWebProjectService().findWebProjectNodeFromStore(stagingStoreName);
+      NodeRef webProjectRef = getWebProjectService().getWebProjectNodeFromStore(WCMUtil.getWebProjectStoreId(userStoreName));
       
       // update the UI context to the web project
       this.browseBean.clickSpace(webProjectRef);
diff --git a/source/java/org/alfresco/web/bean/wcm/ManageReviewTaskDialog.java b/source/java/org/alfresco/web/bean/wcm/ManageReviewTaskDialog.java
index bcdc4ecbb2..c1b067a0aa 100644
--- a/source/java/org/alfresco/web/bean/wcm/ManageReviewTaskDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/ManageReviewTaskDialog.java
@@ -35,6 +35,7 @@ import org.alfresco.linkvalidation.LinkValidationReport;
 import org.alfresco.repo.domain.PropertyValue;
 import org.alfresco.sandbox.SandboxConstants;
 import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.wcm.util.WCMUtil;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.bean.workflow.ManageTaskDialog;
@@ -84,8 +85,7 @@ public class ManageReviewTaskDialog extends ManageTaskDialog
          this.store = this.workflowPackage.getStoreRef().getIdentifier();
          
          // get the web project noderef for the workflow store
-         String stagingStore = AVMUtil.getStoreId(this.store);
-         this.webProjectRef = getWebProjectService().findWebProjectNodeFromStore(stagingStore);
+         this.webProjectRef = getWebProjectService().getWebProjectNodeFromStore(WCMUtil.getWebProjectStoreId(this.store));
          
          PropertyValue val = this.getAvmService().getStoreProperty(this.store, 
                   SandboxConstants.PROP_LINK_VALIDATION_REPORT);
diff --git a/source/java/org/alfresco/web/ui/wcm/component/UISandboxSnapshots.java b/source/java/org/alfresco/web/ui/wcm/component/UISandboxSnapshots.java
index 39362db63b..1d1a9ea780 100644
--- a/source/java/org/alfresco/web/ui/wcm/component/UISandboxSnapshots.java
+++ b/source/java/org/alfresco/web/ui/wcm/component/UISandboxSnapshots.java
@@ -42,14 +42,15 @@ import javax.transaction.UserTransaction;
 
 import org.alfresco.model.WCMAppModel;
 import org.alfresco.repo.domain.PropertyValue;
-import org.alfresco.wcm.sandbox.SandboxConstants;
 import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.avm.VersionDescriptor;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.namespace.RegexQNamePattern;
+import org.alfresco.wcm.sandbox.SandboxConstants;
 import org.alfresco.wcm.sandbox.SandboxService;
+import org.alfresco.wcm.util.WCMUtil;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.bean.wcm.AVMCompareUtils;
@@ -234,7 +235,7 @@ public class UISandboxSnapshots extends SelfRenderingComponent
 
             // determine whether the deploy action should be shown
             boolean showDeployAction = false;
-            NodeRef webProjectRef = Repository.getServiceRegistry(context).getWebProjectService().findWebProjectNodeFromStore(sandbox);
+            NodeRef webProjectRef = Repository.getServiceRegistry(context).getWebProjectService().getWebProjectNodeFromStore(WCMUtil.getWebProjectStoreId(sandbox));
             List<NodeRef> deployToServers = DeploymentUtil.findLiveServers(webProjectRef);
             if (deployToServers != null && deployToServers.size() > 0)
             {