diff --git a/source/java/org/alfresco/web/bean/wcm/RevertAllDialog.java b/source/java/org/alfresco/web/bean/wcm/RevertAllDialog.java
index 372529aa24..bad6d04864 100644
--- a/source/java/org/alfresco/web/bean/wcm/RevertAllDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/RevertAllDialog.java
@@ -79,7 +79,7 @@ public class RevertAllDialog extends BaseDialogBean
       String webApp = this.avmBrowseBean.getWebapp();
       String userSandboxId = this.avmBrowseBean.getSandbox();
       
-      getSandboxService().revertAllWebApp(userSandboxId, webApp);
+      getSandboxService().revertWebApp(userSandboxId, webApp);
        
       String msg = MessageFormat.format(Application.getMessage(
             context, MSG_REVERTALL_SUCCESS), this.avmBrowseBean.getUsername());
diff --git a/source/java/org/alfresco/web/bean/wcm/RevertSelectedDialog.java b/source/java/org/alfresco/web/bean/wcm/RevertSelectedDialog.java
index f8e2a3350a..309b7c7f29 100644
--- a/source/java/org/alfresco/web/bean/wcm/RevertSelectedDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/RevertSelectedDialog.java
@@ -79,7 +79,7 @@ public class RevertSelectedDialog extends BaseDialogBean
       String webApp = this.avmBrowseBean.getWebapp();
       String userSandboxId = this.avmBrowseBean.getSandbox();
        
-      getSandboxService().revertAllWebApp(userSandboxId, webApp);
+      getSandboxService().revertWebApp(userSandboxId, webApp);
       
       String msg = MessageFormat.format(Application.getMessage(
                   context, MSG_REVERTSELECTED_SUCCESS), this.avmBrowseBean.getUsername());
diff --git a/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java b/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
index 165f87b6b1..bf37718ec1 100644
--- a/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
+++ b/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
@@ -456,7 +456,7 @@ public class UIUserSandboxes extends SelfRenderingComponent implements Serializa
                   out.write("</nobr></td><td><nobr>");
                   
                   // Preview Website
-                  String websiteUrl = AVMUtil.getPreviewURI(mainStore, '/' + JNDIConstants.DIR_DEFAULT_WWW + '/' + JNDIConstants.DIR_DEFAULT_APPBASE + '/' + getWebapp());
+                  String websiteUrl = AVMUtil.getPreviewURI(mainStore, JNDIConstants.DIR_DEFAULT_WWW_APPBASE + '/' + getWebapp());
                   Map requestMap = context.getExternalContext().getRequestMap();
                   requestMap.put(REQUEST_PREVIEW_REF, websiteUrl);
                   Utils.encodeRecursive(context, aquireAction(
@@ -720,7 +720,7 @@ public class UIUserSandboxes extends SelfRenderingComponent implements Serializa
       
       // compare user sandbox to staging sandbox - filter by current webapp, include deleted items
       String userStore = AVMUtil.buildUserMainStoreName(storeRoot, username);
-      List<AVMNodeDescriptor> nodes = sandboxService.listChangedItemsWebApp(userStore, getWebapp(), true);
+      List<AVMNodeDescriptor> nodes = sandboxService.listChangedWebApp(userStore, getWebapp(), true);
       
       if (nodes.size() != 0)
       {
@@ -840,7 +840,7 @@ public class UIUserSandboxes extends SelfRenderingComponent implements Serializa
                // build node context required for actions
                AVMNode avmNode = new AVMNode(node);
                String assetPath = sourcePath.substring(rootPathIndex);
-               String previewUrl = AVMUtil.getPreviewURI(userStore, '/' + JNDIConstants.DIR_DEFAULT_WWW + '/' + JNDIConstants.DIR_DEFAULT_APPBASE + assetPath);
+               String previewUrl = AVMUtil.getPreviewURI(userStore, JNDIConstants.DIR_DEFAULT_WWW_APPBASE + assetPath);
                avmNode.getProperties().put("previewUrl", previewUrl);
                
                // size of files