diff --git a/config/alfresco/action-services-context.xml b/config/alfresco/action-services-context.xml
index d49fdaf2cd..13b66c0759 100644
--- a/config/alfresco/action-services-context.xml
+++ b/config/alfresco/action-services-context.xml
@@ -496,7 +496,7 @@
     	</property>
     </bean>
     
-    <bean id="avm-deploy-snapshot" class="org.alfresco.repo.avm.actions.AVMDeploySnapshotAction" parent="action-executer">
+    <bean id="avm-deploy-website" class="org.alfresco.repo.avm.actions.AVMDeployWebsiteAction" parent="action-executer">
     	<property name="deploymentService">
     	    <ref bean="DeploymentService"/>
     	</property>
diff --git a/config/alfresco/messages/action-config.properties b/config/alfresco/messages/action-config.properties
index f0afab89ef..b4c59af1f8 100644
--- a/config/alfresco/messages/action-config.properties
+++ b/config/alfresco/messages/action-config.properties
@@ -115,13 +115,13 @@ avm-undo-list.title=Make a list of Nodes in a store transparent to staging.
 avm-undo-list.description=This acts as a mistake eraser for a user's sandbox.
 avm-undo-list.node-list.display-label=The string encoded list of nodes to revert.
 
-avm-deploy-snapshot.title=Deploy a snapshot to a remote server.
-avm-deploy-snapshot.description=This deploys a website snapshot to a remote server.
-avm-deploy-snapshot.website.display-label=NodeRef of the website the deploy is occurring from.
-avm-deploy-snapshot.server.display-label=NodeRef of the deploymentserver to deploy to.
-avm-deploy-snapshot.attempt.display-label=NodeRef of the deploymentattempt this deployment is part of.
-avm-deploy-snapshot.callback.display-label=The DeploymentCallback listener object.
-avm-deploy-snapshot.delay.display-label=An optional delay to apply to the start of a deployment.
+avm-deploy-website.title=Deploy a website to a remote server.
+avm-deploy-website.description=This deploys a website to a remote server.
+avm-deploy-website.website.display-label=NodeRef of the website the deploy is occurring from.
+avm-deploy-website.server.display-label=NodeRef of the deploymentserver to deploy to.
+avm-deploy-website.attempt.display-label=NodeRef of the deploymentattempt this deployment is part of.
+avm-deploy-website.callback.display-label=The DeploymentCallback listener object.
+avm-deploy-website.delay.display-label=An optional delay to apply to the start of a deployment.
 
 start-avm-workflow.title=Start a WCM Workflow
 start-avm-workflow.description=Starts a workflow expecting an AVM workflow package
diff --git a/config/alfresco/messages/avm-messages.properties b/config/alfresco/messages/avm-messages.properties
index 9ba915b862..7f8bd74ae6 100644
--- a/config/alfresco/messages/avm-messages.properties
+++ b/config/alfresco/messages/avm-messages.properties
@@ -1,4 +1,5 @@
 # AVM related messages
 
 expiredcontent.workflow.title=Expired Content In ''{0}''
-avmlockservice.locked=You do not have access to the item at path {0} it is currently locked by another user.
\ No newline at end of file
+avmlockservice.locked=You do not have access to the item at path {0} it is currently locked by another user.
+testserver.taken=The test server ''{0}'' you selected has been allocated to another user, if possible, select a different server and try again.
\ No newline at end of file
diff --git a/config/alfresco/model/wcmAppModel.xml b/config/alfresco/model/wcmAppModel.xml
index 43ee4f91aa..574c74ce47 100644
--- a/config/alfresco/model/wcmAppModel.xml
+++ b/config/alfresco/model/wcmAppModel.xml
@@ -325,6 +325,11 @@
             <property name="wca:deployserverallocatedto">
                <title>Allocated To</title>
                <type>d:text</type>
+               <index enabled="true">
+                  <atomic>true</atomic>
+                  <stored>false</stored>
+                  <tokenised>false</tokenised>
+               </index>
             </property>
             <property name="wca:deployonapproval">
                <title>Deploy On Approval</title>
diff --git a/source/java/org/alfresco/repo/avm/actions/AVMDeploySnapshotAction.java b/source/java/org/alfresco/repo/avm/actions/AVMDeployWebsiteAction.java
similarity index 98%
rename from source/java/org/alfresco/repo/avm/actions/AVMDeploySnapshotAction.java
rename to source/java/org/alfresco/repo/avm/actions/AVMDeployWebsiteAction.java
index 50e428458b..6ec74b64d9 100644
--- a/source/java/org/alfresco/repo/avm/actions/AVMDeploySnapshotAction.java
+++ b/source/java/org/alfresco/repo/avm/actions/AVMDeployWebsiteAction.java
@@ -58,13 +58,13 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /**
- * Deploys a website snapshot to a remote server.
+ * Deploys a website to a remote server.
  * 
  * @author gavinc
  */
-public class AVMDeploySnapshotAction extends ActionExecuterAbstractBase
+public class AVMDeployWebsiteAction extends ActionExecuterAbstractBase
 {
-   public static final String NAME = "avm-deploy-snapshot";
+   public static final String NAME = "avm-deploy-website";
    public static final String FILE_SERVER_PREFIX = "\\\\";
 
    public static final String PARAM_WEBSITE = "website";
@@ -82,7 +82,7 @@ public class AVMDeploySnapshotAction extends ActionExecuterAbstractBase
    private ContentService contentService;
    private NodeService nodeService;
 
-   private static Log logger = LogFactory.getLog(AVMDeploySnapshotAction.class);
+   private static Log logger = LogFactory.getLog(AVMDeployWebsiteAction.class);
    private static Log delayDeploymentLogger = LogFactory.getLog("alfresco.deployment.delay");
    
    /**