diff --git a/config/alfresco/deployment-service-context.xml b/config/alfresco/deployment-service-context.xml
index a79ec03399..08dcf9999e 100644
--- a/config/alfresco/deployment-service-context.xml
+++ b/config/alfresco/deployment-service-context.xml
@@ -21,11 +21,11 @@
      </bean>  
      
      <!--  Transport adapters to communicate with remote File System Receivers -->     
-     <!--  Communicate with an FSR over RMI - Default method for Alfresco-->
+     <!--  Communicate with an Deployment Server over RMI - Default method for Alfresco-->
      <bean id="rmiFSRAdapter" class="org.alfresco.repo.deploy.DeploymentReceiverTransportAdapterRMI">
      </bean>
      
-     <!--  communicate with an FSR over RMI with the content encrypted  -->
+     <!--  communicate with an Deployment Server over RMI with the content encrypted  -->
      <bean id="encryptedRMIFSRAdapter" class="org.alfresco.repo.deploy.DeploymentReceiverTransportAdapterRMI">
           <property name="transformers">
             <list>
@@ -34,7 +34,7 @@
         </property>
      </bean>
      
-     <!--  communicate with an FSR over RMI with the content compressed then encrypted  -->
+     <!--  communicate with an Deployment Server over RMI with the content compressed then encrypted  -->
      <bean id="compressEncryptedRMIFSRAdapter" class="org.alfresco.repo.deploy.DeploymentReceiverTransportAdapterRMI">
           <property name="transformers">
             <list>
@@ -44,10 +44,10 @@
         </property>
      </bean>
      
-     <!--  how to communicate with an FSR over Spring HTTP -->
+     <!--  how to communicate with an Deployment Server over Spring HTTP -->
      <bean id="springHttpFSRAdapter" class="org.alfresco.repo.deploy.DeploymentReceiverTransportAdapterSpringHTTP">
         <property name="urlPattern">
-         	<value>http://{1}:{2}/alfrescoFSR/deployment</value>
+         	<value>http://{0}:{1}/ADSR/deployment</value>
         </property>
      </bean>
      
diff --git a/source/java/org/alfresco/repo/deploy/DeploymentReceiverTransportAdapterHessian.java b/source/java/org/alfresco/repo/deploy/DeploymentReceiverTransportAdapterHessian.java
index 29ef96a2e4..8ee87741e1 100644
--- a/source/java/org/alfresco/repo/deploy/DeploymentReceiverTransportAdapterHessian.java
+++ b/source/java/org/alfresco/repo/deploy/DeploymentReceiverTransportAdapterHessian.java
@@ -39,16 +39,16 @@ public class DeploymentReceiverTransportAdapterHessian extends AbstractDeploymen
 	/**
 	 * The pattern to use when constructing the URL from hostname and port
 	 * 
-	 * eg http://localhost:8080/FSR/deployment
+	 * eg http://localhost:8080/ADSR/deployment
 	 */
-	private String urlPattern = "http://{1}:{2}/FSR/deployment";
+	private String urlPattern = "http://{0}:{1}/ADSR/deployment";
 	
 	public DeploymentReceiverTransport getTransport(String host,
 			int port, int version, String srcPath) 
 	{
-       	MessageFormat f = new MessageFormat(urlPattern);
-    	Object[] objs = { host, port };
-    	String URL = f.format(objs);
+	    MessageFormat f = new MessageFormat(getUrlPattern());
+	    Object[] objs = { host, Integer.toString(port) };
+	    String URL = f.format(objs);
 		
 		// Code to use Hessian transport provided via Spring
 		HessianProxyFactoryBean factory = new HessianProxyFactoryBean();
diff --git a/source/java/org/alfresco/repo/deploy/DeploymentReceiverTransportAdapterSpringHTTP.java b/source/java/org/alfresco/repo/deploy/DeploymentReceiverTransportAdapterSpringHTTP.java
index 47f913cb62..ed4957c918 100644
--- a/source/java/org/alfresco/repo/deploy/DeploymentReceiverTransportAdapterSpringHTTP.java
+++ b/source/java/org/alfresco/repo/deploy/DeploymentReceiverTransportAdapterSpringHTTP.java
@@ -38,17 +38,17 @@ import org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean;
 public class DeploymentReceiverTransportAdapterSpringHTTP extends AbstractDeploymentReceiverTransportAdapter implements DeploymentReceiverTransportAdapter {
 	/**
 	 * The pattern to use when constructing the URL from hostname and port
-	 * {1} substitues for hostname {2} substitues for port
-	 * Default format results in the following URL http://localhost:8080/alfrescoFSR/deployment
+	 * {0} substitues for hostname {1} substitues for port
+	 * Default format results in the following URL http://localhost:8080/ADSR/deployment
 	 */
-	private String urlPattern = "http://{1}:{2}/alfrescoFSR/deployment";
+	private String urlPattern = "http://{0}:{1}/ADSR/deployment";
 	
 	public DeploymentReceiverTransport getTransport(String host,
 			int port, int version, String srcPath) 
 	{
 
 	    MessageFormat f = new MessageFormat(getUrlPattern());
-	    Object[] objs = { host, port };
+	    Object[] objs = { host, Integer.toString(port) };
 	    String URL = f.format(objs);
 		
 		// Code to use HTTP spring transport