diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
index 5062d32dcc..6ca3fff079 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
@@ -1034,7 +1034,7 @@ private[akka] case class RemoteActorRef private[akka] (
   loader: Option[ClassLoader])
   extends ActorRef with ScalaActorRef {
 
-  ClusterModule.ensureEnabled()
+  RemoteModule.ensureEnabled()
 
   protected[akka] override def timeout: Long = _timeout
 
diff --git a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
index cb9b856955..475530630e 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
@@ -37,10 +37,13 @@ private[akka] class ActorRefProviders(
 
   import ActorRefProvider._
 
-  def register(provider: ActorRefProvider, providerType: ProviderType) = providerType match {
-    case LocalProvider   ⇒ localProvider = Option(provider)
-    case RemoteProvider  ⇒ remoteProvider = Option(provider)
-    case ClusterProvider ⇒ clusterProvider = Option(provider)
+  def register(providerType: ProviderType, provider: ActorRefProvider) = {
+    EventHandler.info(this, "Registering ActorRefProvider [%s]".format(provider.getClass.getName))
+    providerType match {
+      case LocalProvider   ⇒ localProvider = Option(provider)
+      case RemoteProvider  ⇒ remoteProvider = Option(provider)
+      case ClusterProvider ⇒ clusterProvider = Option(provider)
+    }
   }
 
   //FIXME Implement support for configuring by deployment ID etc
@@ -64,8 +67,8 @@ private[akka] class ActorRefProviders(
     actorOf(props, address, providersAsList).getOrElse(throw new ActorRefProviderException(
       "Actor [" +
         address +
-        "] could not be created or found in any of the registered ActorRefProvider's [" +
-        providersAsList.mkString(", ") + "]"))
+        "] could not be found in or created by any of the registered 'ActorRefProvider's [" +
+        providersAsList.map(_.getClass.getName).mkString(", ") + "]"))
   }
 
   def findActorRef(address: String): Option[ActorRef] = {
diff --git a/akka-actor/src/main/scala/akka/actor/Deployer.scala b/akka-actor/src/main/scala/akka/actor/Deployer.scala
index e7c3e63c61..23e5fa1306 100644
--- a/akka-actor/src/main/scala/akka/actor/Deployer.scala
+++ b/akka-actor/src/main/scala/akka/actor/Deployer.scala
@@ -327,7 +327,7 @@ object LocalDeployer extends ActorDeployer {
   private val deployments = new ConcurrentHashMap[String, Deploy]
 
   private[akka] def init(deployments: Seq[Deploy]) {
-    EventHandler.info(this, "Deploying actors locally [\n\t%s\n]" format deployments.mkString("\n\t"))
+    EventHandler.info(this, "Loading deployment plans [\n\t%s\n]" format deployments.mkString("\n\t"))
     deployments foreach (deploy(_)) // deploy
   }
 
diff --git a/akka-actor/src/main/scala/akka/config/Config.scala b/akka-actor/src/main/scala/akka/config/Config.scala
index f2d85b71a2..fbc8fcc567 100644
--- a/akka-actor/src/main/scala/akka/config/Config.scala
+++ b/akka-actor/src/main/scala/akka/config/Config.scala
@@ -103,17 +103,19 @@ object Config {
 
   val isClusterEnabled = config.getList("akka.enabled-modules").exists(_ == "cluster")
 
-  lazy val nodename = System.getProperty("akka.cluster.nodename") match {
+  val clusterName = config.getString("akka.cluster.name", "default")
+
+  val nodename = System.getProperty("akka.cluster.nodename") match {
     case null | "" ⇒ new UUID().toString
     case value     ⇒ value
   }
 
-  lazy val hostname = System.getProperty("akka.cluster.hostname") match {
+  val hostname = System.getProperty("akka.remote.hostname") match {
     case null | "" ⇒ InetAddress.getLocalHost.getHostName
     case value     ⇒ value
   }
 
-  val remoteServerPort = System.getProperty("akka.cluster.port") match {
+  val remoteServerPort = System.getProperty("akka.remote.port") match {
     case null | "" ⇒
       System.getProperty("akka.remote.server.port") match {
         case null | "" ⇒ config.getInt("akka.remote.server.port", 2552)
@@ -122,8 +124,6 @@ object Config {
     case value ⇒ value.toInt
   }
 
-  val clusterName = config.getString("akka.cluster.name", "default")
-
   val startTime = System.currentTimeMillis
   def uptime = (System.currentTimeMillis - startTime) / 1000
 }
diff --git a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala
index fdee03d5fa..b80f056ae0 100644
--- a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala
@@ -168,8 +168,8 @@ object Cluster {
    * Currently supported options are:
    * <pre>
    *   Cluster setProperty ("akka.cluster.nodename", "node1")
-   *   Cluster setProperty ("akka.cluster.hostname", "darkstar.lan")
-   *   Cluster setProperty ("akka.cluster.port", "1234")
+   *   Cluster setProperty ("akka.remote.hostname", "darkstar.lan")
+   *   Cluster setProperty ("akka.remote.port", "1234")
    * </pre>
    */
   def setProperty(property: (String, String)) {
@@ -181,12 +181,12 @@ object Cluster {
     case None           ⇒ Config.nodename
   }
 
-  private def hostname: String = properties.get("akka.cluster.hostname") match {
+  private def hostname: String = properties.get("akka.remote.hostname") match {
     case Some(uberride) ⇒ uberride
     case None           ⇒ Config.hostname
   }
 
-  private def port: Int = properties.get("akka.cluster.port") match {
+  private def port: Int = properties.get("akka.remote.port") match {
     case Some(uberride) ⇒ uberride.toInt
     case None           ⇒ Config.remoteServerPort
   }
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterDeployer.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterDeployer.scala
index cd2ee02b8e..c9ac211821 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterDeployer.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterDeployer.scala
@@ -54,11 +54,11 @@ object ClusterDeployer extends ActorDeployer {
 
   private val deploymentInProgressLockListener = new LockListener {
     def lockAcquired() {
-      EventHandler.debug(this, "Clustered deployment started")
+      EventHandler.info(this, "Clustered deployment started")
     }
 
     def lockReleased() {
-      EventHandler.debug(this, "Clustered deployment completed")
+      EventHandler.info(this, "Clustered deployment completed")
       deploymentCompleted.countDown()
     }
   }
@@ -121,13 +121,13 @@ object ClusterDeployer extends ActorDeployer {
     val deployments = addresses map { address ⇒
       zkClient.readData(deploymentAddressPath.format(address)).asInstanceOf[Deploy]
     }
-    EventHandler.info(this, "Fetched deployment plan from cluster [\n\t%s\n]" format deployments.mkString("\n\t"))
+    EventHandler.info(this, "Fetched deployment plans from cluster [\n\t%s\n]" format deployments.mkString("\n\t"))
     deployments
   }
 
   private[akka] def init(deployments: Seq[Deploy]) {
     isConnected switchOn {
-      EventHandler.info(this, "Initializing cluster deployer")
+      EventHandler.info(this, "Initializing ClusterDeployer")
 
       basePaths foreach { path ⇒
         try {
@@ -146,7 +146,7 @@ object ClusterDeployer extends ActorDeployer {
       if (!isDeploymentCompletedInCluster) {
         if (deploymentInProgressLock.lock()) {
           // try to be the one doing the clustered deployment
-          EventHandler.info(this, "Pushing deployment plan cluster [\n\t" + allDeployments.mkString("\n\t") + "\n]")
+          EventHandler.info(this, "Pushing clustered deployment plans [\n\t" + allDeployments.mkString("\n\t") + "\n]")
           allDeployments foreach (deploy(_)) // deploy
           markDeploymentCompletedInCluster()
           deploymentInProgressLock.unlock() // signal deployment complete
@@ -176,9 +176,11 @@ object ClusterDeployer extends ActorDeployer {
             zkClient.writeData(path, deployment)
           } catch {
             case e: NullPointerException ⇒
-              handleError(new DeploymentException("Could not store deployment data [" + deployment + "] in ZooKeeper since client session is closed"))
+              handleError(new DeploymentException(
+                "Could not store deployment data [" + deployment + "] in ZooKeeper since client session is closed"))
             case e: Exception ⇒
-              handleError(new DeploymentException("Could not store deployment data [" + deployment + "] in ZooKeeper due to: " + e))
+              handleError(new DeploymentException(
+                "Could not store deployment data [" + deployment + "] in ZooKeeper due to: " + e))
           }
       }
     }
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/newleader/NewLeaderChangeListenerMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/newleader/NewLeaderChangeListenerMultiJvmNode1.opts
index a88c260d8c..dc86c1c9c0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/newleader/NewLeaderChangeListenerMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/newleader/NewLeaderChangeListenerMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/newleader/NewLeaderChangeListenerMultiJvmNode2.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/newleader/NewLeaderChangeListenerMultiJvmNode2.opts
index f1e01f253d..bb140941a5 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/newleader/NewLeaderChangeListenerMultiJvmNode2.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/newleader/NewLeaderChangeListenerMultiJvmNode2.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node2 -Dakka.cluster.port=9992
+-Dakka.cluster.nodename=node2 -Dakka.remote.port=9992
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/nodeconnected/NodeConnectedChangeListenerMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/nodeconnected/NodeConnectedChangeListenerMultiJvmNode1.opts
index a88c260d8c..dc86c1c9c0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/nodeconnected/NodeConnectedChangeListenerMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/nodeconnected/NodeConnectedChangeListenerMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/nodeconnected/NodeConnectedChangeListenerMultiJvmNode2.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/nodeconnected/NodeConnectedChangeListenerMultiJvmNode2.opts
index f1e01f253d..bb140941a5 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/nodeconnected/NodeConnectedChangeListenerMultiJvmNode2.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/nodeconnected/NodeConnectedChangeListenerMultiJvmNode2.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node2 -Dakka.cluster.port=9992
+-Dakka.cluster.nodename=node2 -Dakka.remote.port=9992
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/nodedisconnected/NodeDisconnectedChangeListenerMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/nodedisconnected/NodeDisconnectedChangeListenerMultiJvmNode1.opts
index a88c260d8c..dc86c1c9c0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/nodedisconnected/NodeDisconnectedChangeListenerMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/nodedisconnected/NodeDisconnectedChangeListenerMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/nodedisconnected/NodeDisconnectedChangeListenerMultiJvmNode2.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/nodedisconnected/NodeDisconnectedChangeListenerMultiJvmNode2.opts
index f1e01f253d..bb140941a5 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/nodedisconnected/NodeDisconnectedChangeListenerMultiJvmNode2.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/nodedisconnected/NodeDisconnectedChangeListenerMultiJvmNode2.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node2 -Dakka.cluster.port=9992
+-Dakka.cluster.nodename=node2 -Dakka.remote.port=9992
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/configuration/ConfigurationStorageMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/configuration/ConfigurationStorageMultiJvmNode1.opts
index a88c260d8c..dc86c1c9c0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/configuration/ConfigurationStorageMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/configuration/ConfigurationStorageMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/configuration/ConfigurationStorageMultiJvmNode2.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/configuration/ConfigurationStorageMultiJvmNode2.opts
index f1e01f253d..bb140941a5 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/configuration/ConfigurationStorageMultiJvmNode2.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/configuration/ConfigurationStorageMultiJvmNode2.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node2 -Dakka.cluster.port=9992
+-Dakka.cluster.nodename=node2 -Dakka.remote.port=9992
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/leader/election/LeaderElectionMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/leader/election/LeaderElectionMultiJvmNode1.opts
index a88c260d8c..dc86c1c9c0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/leader/election/LeaderElectionMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/leader/election/LeaderElectionMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/leader/election/LeaderElectionMultiJvmNode2.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/leader/election/LeaderElectionMultiJvmNode2.opts
index f1e01f253d..bb140941a5 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/leader/election/LeaderElectionMultiJvmNode2.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/leader/election/LeaderElectionMultiJvmNode2.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node2 -Dakka.cluster.port=9992
+-Dakka.cluster.nodename=node2 -Dakka.remote.port=9992
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/registry/RegistryStoreMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/registry/RegistryStoreMultiJvmNode1.opts
index a88c260d8c..dc86c1c9c0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/registry/RegistryStoreMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/registry/RegistryStoreMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/registry/RegistryStoreMultiJvmNode2.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/registry/RegistryStoreMultiJvmNode2.opts
index f1e01f253d..bb140941a5 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/registry/RegistryStoreMultiJvmNode2.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/registry/RegistryStoreMultiJvmNode2.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node2 -Dakka.cluster.port=9992
+-Dakka.cluster.nodename=node2 -Dakka.remote.port=9992
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/deployment/DeploymentMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/deployment/DeploymentMultiJvmNode1.opts
index a88c260d8c..dc86c1c9c0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/deployment/DeploymentMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/deployment/DeploymentMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/deployment/DeploymentMultiJvmNode2.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/deployment/DeploymentMultiJvmNode2.opts
index f1e01f253d..bb140941a5 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/deployment/DeploymentMultiJvmNode2.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/deployment/DeploymentMultiJvmNode2.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node2 -Dakka.cluster.port=9992
+-Dakka.cluster.nodename=node2 -Dakka.remote.port=9992
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/metrics/local/LocalMetricsMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/metrics/local/LocalMetricsMultiJvmNode1.opts
index a88c260d8c..dc86c1c9c0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/metrics/local/LocalMetricsMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/metrics/local/LocalMetricsMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/metrics/remote/RemoteMetricsMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/metrics/remote/RemoteMetricsMultiJvmNode1.opts
index a88c260d8c..dc86c1c9c0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/metrics/remote/RemoteMetricsMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/metrics/remote/RemoteMetricsMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/metrics/remote/RemoteMetricsMultiJvmNode2.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/metrics/remote/RemoteMetricsMultiJvmNode2.opts
index f1e01f253d..bb140941a5 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/metrics/remote/RemoteMetricsMultiJvmNode2.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/metrics/remote/RemoteMetricsMultiJvmNode2.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node2 -Dakka.cluster.port=9992
+-Dakka.cluster.nodename=node2 -Dakka.remote.port=9992
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/migration/MigrationExplicitMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/migration/MigrationExplicitMultiJvmNode1.opts
index a88c260d8c..dc86c1c9c0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/migration/MigrationExplicitMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/migration/MigrationExplicitMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/migration/MigrationExplicitMultiJvmNode2.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/migration/MigrationExplicitMultiJvmNode2.opts
index f1e01f253d..bb140941a5 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/migration/MigrationExplicitMultiJvmNode2.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/migration/MigrationExplicitMultiJvmNode2.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node2 -Dakka.cluster.port=9992
+-Dakka.cluster.nodename=node2 -Dakka.remote.port=9992
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/reflogic/ClusterActorRefCleanupMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/reflogic/ClusterActorRefCleanupMultiJvmNode1.opts
index a88c260d8c..dc86c1c9c0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/reflogic/ClusterActorRefCleanupMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/reflogic/ClusterActorRefCleanupMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/reflogic/ClusterActorRefCleanupMultiJvmNode2.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/reflogic/ClusterActorRefCleanupMultiJvmNode2.opts
index f1e01f253d..bb140941a5 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/reflogic/ClusterActorRefCleanupMultiJvmNode2.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/reflogic/ClusterActorRefCleanupMultiJvmNode2.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node2 -Dakka.cluster.port=9992
+-Dakka.cluster.nodename=node2 -Dakka.remote.port=9992
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/reflogic/ClusterActorRefCleanupMultiJvmNode3.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/reflogic/ClusterActorRefCleanupMultiJvmNode3.opts
index 202496ad31..089e3b7776 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/reflogic/ClusterActorRefCleanupMultiJvmNode3.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/reflogic/ClusterActorRefCleanupMultiJvmNode3.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node3 -Dakka.cluster.port=9993
+-Dakka.cluster.nodename=node3 -Dakka.remote.port=9993
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writebehind/nosnapshot/ReplicationTransactionLogWriteBehindNoSnapshotMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writebehind/nosnapshot/ReplicationTransactionLogWriteBehindNoSnapshotMultiJvmNode1.opts
index a88c260d8c..dc86c1c9c0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writebehind/nosnapshot/ReplicationTransactionLogWriteBehindNoSnapshotMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writebehind/nosnapshot/ReplicationTransactionLogWriteBehindNoSnapshotMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writebehind/nosnapshot/ReplicationTransactionLogWriteBehindNoSnapshotMultiJvmNode2.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writebehind/nosnapshot/ReplicationTransactionLogWriteBehindNoSnapshotMultiJvmNode2.opts
index f1e01f253d..bb140941a5 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writebehind/nosnapshot/ReplicationTransactionLogWriteBehindNoSnapshotMultiJvmNode2.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writebehind/nosnapshot/ReplicationTransactionLogWriteBehindNoSnapshotMultiJvmNode2.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node2 -Dakka.cluster.port=9992
+-Dakka.cluster.nodename=node2 -Dakka.remote.port=9992
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writebehind/snapshot/ReplicationTransactionLogWriteBehindSnapshotMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writebehind/snapshot/ReplicationTransactionLogWriteBehindSnapshotMultiJvmNode1.opts
index a88c260d8c..dc86c1c9c0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writebehind/snapshot/ReplicationTransactionLogWriteBehindSnapshotMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writebehind/snapshot/ReplicationTransactionLogWriteBehindSnapshotMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writebehind/snapshot/ReplicationTransactionLogWriteBehindSnapshotMultiJvmNode2.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writebehind/snapshot/ReplicationTransactionLogWriteBehindSnapshotMultiJvmNode2.opts
index f1e01f253d..bb140941a5 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writebehind/snapshot/ReplicationTransactionLogWriteBehindSnapshotMultiJvmNode2.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writebehind/snapshot/ReplicationTransactionLogWriteBehindSnapshotMultiJvmNode2.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node2 -Dakka.cluster.port=9992
+-Dakka.cluster.nodename=node2 -Dakka.remote.port=9992
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/nosnapshot/ReplicationTransactionLogWriteThroughNoSnapshotMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/nosnapshot/ReplicationTransactionLogWriteThroughNoSnapshotMultiJvmNode1.opts
index a88c260d8c..dc86c1c9c0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/nosnapshot/ReplicationTransactionLogWriteThroughNoSnapshotMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/nosnapshot/ReplicationTransactionLogWriteThroughNoSnapshotMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/nosnapshot/ReplicationTransactionLogWriteThroughNoSnapshotMultiJvmNode2.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/nosnapshot/ReplicationTransactionLogWriteThroughNoSnapshotMultiJvmNode2.opts
index f1e01f253d..bb140941a5 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/nosnapshot/ReplicationTransactionLogWriteThroughNoSnapshotMultiJvmNode2.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/nosnapshot/ReplicationTransactionLogWriteThroughNoSnapshotMultiJvmNode2.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node2 -Dakka.cluster.port=9992
+-Dakka.cluster.nodename=node2 -Dakka.remote.port=9992
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/snapshot/ReplicationTransactionLogWriteThroughSnapshotMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/snapshot/ReplicationTransactionLogWriteThroughSnapshotMultiJvmNode1.opts
index a88c260d8c..dc86c1c9c0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/snapshot/ReplicationTransactionLogWriteThroughSnapshotMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/snapshot/ReplicationTransactionLogWriteThroughSnapshotMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/snapshot/ReplicationTransactionLogWriteThroughSnapshotMultiJvmNode2.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/snapshot/ReplicationTransactionLogWriteThroughSnapshotMultiJvmNode2.opts
index f1e01f253d..bb140941a5 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/snapshot/ReplicationTransactionLogWriteThroughSnapshotMultiJvmNode2.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/snapshot/ReplicationTransactionLogWriteThroughSnapshotMultiJvmNode2.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node2 -Dakka.cluster.port=9992
+-Dakka.cluster.nodename=node2 -Dakka.remote.port=9992
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/failover/DirectRoutingFailoverMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/failover/DirectRoutingFailoverMultiJvmNode1.opts
index a88c260d8c..dc86c1c9c0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/failover/DirectRoutingFailoverMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/failover/DirectRoutingFailoverMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/failover/DirectRoutingFailoverMultiJvmNode2.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/failover/DirectRoutingFailoverMultiJvmNode2.opts
index f1e01f253d..bb140941a5 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/failover/DirectRoutingFailoverMultiJvmNode2.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/failover/DirectRoutingFailoverMultiJvmNode2.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node2 -Dakka.cluster.port=9992
+-Dakka.cluster.nodename=node2 -Dakka.remote.port=9992
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/homenode/HomeNodeMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/homenode/HomeNodeMultiJvmNode1.opts
index a88c260d8c..dc86c1c9c0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/homenode/HomeNodeMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/homenode/HomeNodeMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/homenode/HomeNodeMultiJvmNode2.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/homenode/HomeNodeMultiJvmNode2.opts
index f1e01f253d..bb140941a5 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/homenode/HomeNodeMultiJvmNode2.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/homenode/HomeNodeMultiJvmNode2.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node2 -Dakka.cluster.port=9992
+-Dakka.cluster.nodename=node2 -Dakka.remote.port=9992
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/normalusage/SingleReplicaDirectRoutingMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/normalusage/SingleReplicaDirectRoutingMultiJvmNode1.opts
index a88c260d8c..dc86c1c9c0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/normalusage/SingleReplicaDirectRoutingMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/normalusage/SingleReplicaDirectRoutingMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/normalusage/SingleReplicaDirectRoutingMultiJvmNode2.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/normalusage/SingleReplicaDirectRoutingMultiJvmNode2.opts
index f1e01f253d..bb140941a5 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/normalusage/SingleReplicaDirectRoutingMultiJvmNode2.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/direct/normalusage/SingleReplicaDirectRoutingMultiJvmNode2.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node2 -Dakka.cluster.port=9992
+-Dakka.cluster.nodename=node2 -Dakka.remote.port=9992
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/failover/RandomFailoverMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/failover/RandomFailoverMultiJvmNode1.opts
index d739389a77..f1306829d9 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/failover/RandomFailoverMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/failover/RandomFailoverMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991 -Dakka.event.force-sync=true
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991 -Dakka.event.force-sync=true
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/failover/RandomFailoverMultiJvmNode2.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/failover/RandomFailoverMultiJvmNode2.opts
index e32c0130f6..897e69f626 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/failover/RandomFailoverMultiJvmNode2.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/failover/RandomFailoverMultiJvmNode2.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node2 -Dakka.cluster.port=9992 -Dakka.event.force-sync=true
+-Dakka.cluster.nodename=node2 -Dakka.remote.port=9992 -Dakka.event.force-sync=true
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/failover/RandomFailoverMultiJvmNode3.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/failover/RandomFailoverMultiJvmNode3.opts
index eba2597cdb..4127fb94fc 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/failover/RandomFailoverMultiJvmNode3.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/failover/RandomFailoverMultiJvmNode3.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node3 -Dakka.cluster.port=9993 -Dakka.event.force-sync=true
+-Dakka.cluster.nodename=node3 -Dakka.remote.port=9993 -Dakka.event.force-sync=true
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/homenode/HomeNodeMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/homenode/HomeNodeMultiJvmNode1.opts
index a88c260d8c..dc86c1c9c0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/homenode/HomeNodeMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/homenode/HomeNodeMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/homenode/HomeNodeMultiJvmNode2.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/homenode/HomeNodeMultiJvmNode2.opts
index f1e01f253d..bb140941a5 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/homenode/HomeNodeMultiJvmNode2.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/homenode/HomeNodeMultiJvmNode2.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node2 -Dakka.cluster.port=9992
+-Dakka.cluster.nodename=node2 -Dakka.remote.port=9992
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_1/Random1ReplicaMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_1/Random1ReplicaMultiJvmNode1.opts
index a88c260d8c..dc86c1c9c0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_1/Random1ReplicaMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_1/Random1ReplicaMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_3/Random3ReplicasMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_3/Random3ReplicasMultiJvmNode1.opts
index a88c260d8c..dc86c1c9c0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_3/Random3ReplicasMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_3/Random3ReplicasMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_3/Random3ReplicasMultiJvmNode2.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_3/Random3ReplicasMultiJvmNode2.opts
index f1e01f253d..bb140941a5 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_3/Random3ReplicasMultiJvmNode2.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_3/Random3ReplicasMultiJvmNode2.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node2 -Dakka.cluster.port=9992
+-Dakka.cluster.nodename=node2 -Dakka.remote.port=9992
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_3/Random3ReplicasMultiJvmNode3.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_3/Random3ReplicasMultiJvmNode3.opts
index 202496ad31..089e3b7776 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_3/Random3ReplicasMultiJvmNode3.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_3/Random3ReplicasMultiJvmNode3.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node3 -Dakka.cluster.port=9993
+-Dakka.cluster.nodename=node3 -Dakka.remote.port=9993
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/failover/RoundRobinFailoverMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/failover/RoundRobinFailoverMultiJvmNode1.opts
index d739389a77..f1306829d9 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/failover/RoundRobinFailoverMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/failover/RoundRobinFailoverMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991 -Dakka.event.force-sync=true
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991 -Dakka.event.force-sync=true
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/failover/RoundRobinFailoverMultiJvmNode2.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/failover/RoundRobinFailoverMultiJvmNode2.opts
index e32c0130f6..897e69f626 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/failover/RoundRobinFailoverMultiJvmNode2.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/failover/RoundRobinFailoverMultiJvmNode2.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node2 -Dakka.cluster.port=9992 -Dakka.event.force-sync=true
+-Dakka.cluster.nodename=node2 -Dakka.remote.port=9992 -Dakka.event.force-sync=true
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/failover/RoundRobinFailoverMultiJvmNode3.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/failover/RoundRobinFailoverMultiJvmNode3.opts
index eba2597cdb..4127fb94fc 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/failover/RoundRobinFailoverMultiJvmNode3.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/failover/RoundRobinFailoverMultiJvmNode3.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node3 -Dakka.cluster.port=9993 -Dakka.event.force-sync=true
+-Dakka.cluster.nodename=node3 -Dakka.remote.port=9993 -Dakka.event.force-sync=true
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/homenode/HomeNodeMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/homenode/HomeNodeMultiJvmNode1.opts
index a88c260d8c..dc86c1c9c0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/homenode/HomeNodeMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/homenode/HomeNodeMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/homenode/HomeNodeMultiJvmNode2.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/homenode/HomeNodeMultiJvmNode2.opts
index f1e01f253d..bb140941a5 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/homenode/HomeNodeMultiJvmNode2.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/homenode/HomeNodeMultiJvmNode2.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node2 -Dakka.cluster.port=9992
+-Dakka.cluster.nodename=node2 -Dakka.remote.port=9992
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_1/RoundRobin1ReplicaMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_1/RoundRobin1ReplicaMultiJvmNode1.opts
index a88c260d8c..dc86c1c9c0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_1/RoundRobin1ReplicaMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_1/RoundRobin1ReplicaMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_2/RoundRobin2ReplicasMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_2/RoundRobin2ReplicasMultiJvmNode1.opts
index a88c260d8c..dc86c1c9c0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_2/RoundRobin2ReplicasMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_2/RoundRobin2ReplicasMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_2/RoundRobin2ReplicasMultiJvmNode2.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_2/RoundRobin2ReplicasMultiJvmNode2.opts
index f1e01f253d..bb140941a5 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_2/RoundRobin2ReplicasMultiJvmNode2.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_2/RoundRobin2ReplicasMultiJvmNode2.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node2 -Dakka.cluster.port=9992
+-Dakka.cluster.nodename=node2 -Dakka.remote.port=9992
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_2/RoundRobin2ReplicasMultiJvmSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_2/RoundRobin2ReplicasMultiJvmSpec.scala
index b08b26658f..4b807bc1ba 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_2/RoundRobin2ReplicasMultiJvmSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_2/RoundRobin2ReplicasMultiJvmSpec.scala
@@ -45,7 +45,7 @@ class RoundRobin2ReplicasMultiJvmNode1 extends MasterClusterTestNode {
 
     "create clustered actor, get a 'local' actor on 'home' node and a 'ref' to actor on remote node" in {
       System.getProperty("akka.cluster.nodename", "") must be("node1")
-      System.getProperty("akka.cluster.port", "") must be("9991")
+      System.getProperty("akka.remote.port", "") must be("9991")
 
       //wait till node 1 has started.
       barrier("start-node1", NrOfNodes) {
@@ -76,7 +76,7 @@ class RoundRobin2ReplicasMultiJvmNode2 extends ClusterTestNode {
 
     "create clustered actor, get a 'local' actor on 'home' node and a 'ref' to actor on remote node" in {
       System.getProperty("akka.cluster.nodename", "") must be("node2")
-      System.getProperty("akka.cluster.port", "") must be("9992")
+      System.getProperty("akka.remote.port", "") must be("9992")
 
       //wait till node 1 has started.
       barrier("start-node1", NrOfNodes).await()
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_3/RoundRobin3ReplicasMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_3/RoundRobin3ReplicasMultiJvmNode1.opts
index a88c260d8c..dc86c1c9c0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_3/RoundRobin3ReplicasMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_3/RoundRobin3ReplicasMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_3/RoundRobin3ReplicasMultiJvmNode2.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_3/RoundRobin3ReplicasMultiJvmNode2.opts
index f1e01f253d..bb140941a5 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_3/RoundRobin3ReplicasMultiJvmNode2.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_3/RoundRobin3ReplicasMultiJvmNode2.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node2 -Dakka.cluster.port=9992
+-Dakka.cluster.nodename=node2 -Dakka.remote.port=9992
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_3/RoundRobin3ReplicasMultiJvmNode3.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_3/RoundRobin3ReplicasMultiJvmNode3.opts
index 202496ad31..089e3b7776 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_3/RoundRobin3ReplicasMultiJvmNode3.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_3/RoundRobin3ReplicasMultiJvmNode3.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node3 -Dakka.cluster.port=9993
+-Dakka.cluster.nodename=node3 -Dakka.remote.port=9993
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/scattergather/failover/ScatterGatherFailoverMultiJvmNode1.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/scattergather/failover/ScatterGatherFailoverMultiJvmNode1.opts
index a88c260d8c..dc86c1c9c0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/scattergather/failover/ScatterGatherFailoverMultiJvmNode1.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/scattergather/failover/ScatterGatherFailoverMultiJvmNode1.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+-Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/scattergather/failover/ScatterGatherFailoverMultiJvmNode2.opts b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/scattergather/failover/ScatterGatherFailoverMultiJvmNode2.opts
index f1e01f253d..bb140941a5 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/scattergather/failover/ScatterGatherFailoverMultiJvmNode2.opts
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/scattergather/failover/ScatterGatherFailoverMultiJvmNode2.opts
@@ -1 +1 @@
--Dakka.cluster.nodename=node2 -Dakka.cluster.port=9992
+-Dakka.cluster.nodename=node2 -Dakka.remote.port=9992
diff --git a/akka-docs/dev/multi-jvm-testing.rst b/akka-docs/dev/multi-jvm-testing.rst
index 9eb036aea5..7e79f65bfa 100644
--- a/akka-docs/dev/multi-jvm-testing.rst
+++ b/akka-docs/dev/multi-jvm-testing.rst
@@ -160,20 +160,20 @@ a file named after the node in the test with suffix ``.opts`` and put them in th
 directory as the test.
 
 For example, to feed the JVM options ``-Dakka.cluster.nodename=node1`` and
-``-Dakka.cluster.port=9991`` to the ``SampleMultiJvmNode1`` let's create three ``*.opts`` files
+``-Dakka.remote.port=9991`` to the ``SampleMultiJvmNode1`` let's create three ``*.opts`` files
 and add the options to them.
 
 ``SampleMultiJvmNode1.opts``::
 
-    -Dakka.cluster.nodename=node1 -Dakka.cluster.port=9991
+    -Dakka.cluster.nodename=node1 -Dakka.remote.port=9991
 
 ``SampleMultiJvmNode2.opts``::
 
-    -Dakka.cluster.nodename=node2 -Dakka.cluster.port=9992
+    -Dakka.cluster.nodename=node2 -Dakka.remote.port=9992
 
 ``SampleMultiJvmNode3.opts``::
 
-    -Dakka.cluster.nodename=node3 -Dakka.cluster.port=9993
+    -Dakka.cluster.nodename=node3 -Dakka.remote.port=9993
 
 
 Overriding akka.conf options
@@ -278,7 +278,7 @@ something in coordination::
 
         "have jvm options" in {
           System.getProperty("akka.cluster.nodename", "") must be("node1")
-          System.getProperty("akka.cluster.port", "") must be("9991")
+          System.getProperty("akka.remote.port", "") must be("9991")
           akka.config.Config.config.getString("test.name", "") must be("node1")
         }
 
@@ -299,7 +299,7 @@ something in coordination::
 
         "have jvm options" in {
           System.getProperty("akka.cluster.nodename", "") must be("node2")
-          System.getProperty("akka.cluster.port", "") must be("9992")
+          System.getProperty("akka.remote.port", "") must be("9992")
           akka.config.Config.config.getString("test.name", "") must be("node2")
         }
 
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
index 4910e0bdba..36e4112a19 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
@@ -46,10 +46,16 @@ class RemoteActorRefProvider extends ActorRefProvider {
         case Some(Deploy(_, _, router, _, RemoteScope(host, port))) ⇒
           // FIXME create RoutedActorRef if 'router' is specified
 
-          val remoteAddress = new InetSocketAddress(host, port)
-          useActorOnNode(remoteAddress, address, props.creator)
-
-          Some(newRemoteActorRef(address, remoteAddress)) // create a remote actor
+          val serverAddress = Remote.address
+          if (serverAddress.getHostName == host && serverAddress.getPort == port) {
+            // home node for this remote actor
+            Some(new LocalActorRef(props, address, false)) // create a local actor
+          } else {
+            // not home node, need to provision it
+            val remoteAddress = new InetSocketAddress(host, port)
+            useActorOnNode(remoteAddress, deployId, props.creator)
+            Some(RemoteActorRef(remoteAddress, address, Actor.TIMEOUT, None)) // create a remote actor
+          }
 
         case deploy ⇒ None // non-remote actor
       }
@@ -78,26 +84,22 @@ class RemoteActorRefProvider extends ActorRefProvider {
       .setPayload(ByteString.copyFrom(actorFactoryBytes))
       .build()
 
-    val connectionFactory = () ⇒ newRemoteActorRef(actorAddress, remoteAddress)
+    val connectionFactory =
+      () ⇒ Remote.server.actorFor(
+        Remote.remoteDaemonServiceName, remoteAddress.getHostName, remoteAddress.getPort)
 
     // try to get the connection for the remote address, if not already there then create it
     val connection = failureDetector.putIfAbsent(remoteAddress, connectionFactory)
 
-    sendCommandToRemoteNode(connection, command, async = false) // ensure we get an ACK on the USE command
-  }
-
-  private def newRemoteActorRef(actorAddress: String, inetSocketAddress: InetSocketAddress) = {
-    RemoteActorRef(inetSocketAddress, actorAddress, Actor.TIMEOUT, None)
+    sendCommandToRemoteNode(connection, command, withACK = true) // ensure we get an ACK on the USE command
   }
 
   private def sendCommandToRemoteNode(
     connection: ActorRef,
     command: RemoteDaemonMessageProtocol,
-    async: Boolean = true) {
+    withACK: Boolean) {
 
-    if (async) {
-      connection ! command
-    } else {
+    if (withACK) {
       try {
         (connection ? (command, Remote.remoteDaemonAckTimeout)).as[Status] match {
           case Some(Success(receiver)) ⇒
@@ -117,6 +119,8 @@ class RemoteActorRefProvider extends ActorRefProvider {
           EventHandler.error(e, this, "Could not send remote command to [%s] due to: %s".format(connection.address, e.toString))
           throw e
       }
+    } else {
+      connection ! command
     }
   }
 }
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala b/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala
index 68d0bbf477..1a5e955398 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala
@@ -36,14 +36,14 @@ object Remote extends RemoteService {
   val hostname = Config.hostname
   val port = Config.remoteServerPort
 
-  val remoteAddress = "akka-remote-daemon".intern
+  val remoteDaemonServiceName = "akka-remote-daemon".intern
 
   // FIXME configure computeGridDispatcher to what?
   val computeGridDispatcher = Dispatchers.newDispatcher("akka:compute-grid").build
 
   private[remote] lazy val remoteDaemon = new LocalActorRef(
     Props(new RemoteDaemon).copy(dispatcher = new PinnedDispatcher()),
-    Remote.remoteAddress,
+    Remote.remoteDaemonServiceName,
     systemService = true)
 
   private[remote] lazy val remoteDaemonSupervisor = Supervisor(
@@ -65,15 +65,19 @@ object Remote extends RemoteService {
   lazy val server: RemoteSupport = {
     val remote = new akka.remote.netty.NettyRemoteSupport
     remote.start(hostname, port)
-    remote.register(Remote.remoteAddress, remoteDaemon)
+    remote.register(Remote.remoteDaemonServiceName, remoteDaemon)
     remote.addListener(NetworkEventStream.channel)
     remote.addListener(remoteClientLifeCycleHandler)
+    Actor.provider.register(ActorRefProvider.RemoteProvider, new RemoteActorRefProvider)
     remote
   }
 
   lazy val address = server.address
 
-  def start() { EventHandler.info(this, "Starting remote server on [%s]".format(address)) }
+  def start() {
+    val triggerLazyServerVal = address.toString
+    EventHandler.info(this, "Starting remote server on [%s]".format(triggerLazyServerVal))
+  }
 
   def uuidProtocolToUuid(uuid: UuidProtocol): UUID = new UUID(uuid.getHigh, uuid.getLow)
 
@@ -137,7 +141,7 @@ class RemoteDaemon extends Actor {
           }
 
         val actorAddress = message.getActorAddress
-        val newActorRef = actorOf(Props(creator = actorFactory, deployId = actorAddress))
+        val newActorRef = actorOf(Props(creator = actorFactory, deployId = actorAddress), actorAddress)
 
         Remote.server.register(actorAddress, newActorRef)
 
@@ -201,7 +205,7 @@ class RemoteDaemon extends Actor {
   }
 
   def handleFailover(message: RemoteProtocol.RemoteDaemonMessageProtocol) {
-    // val (from, to) = payloadFor(message, classOf[(InetSocketremoteAddress, InetSocketremoteAddress)])
+    // val (from, to) = payloadFor(message, classOf[(InetSocketremoteDaemonServiceName, InetSocketremoteDaemonServiceName)])
     // cluster.failOverClusterActorRefConnections(from, to)
   }
 
diff --git a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
index 219712e5fe..9ea6f90242 100644
--- a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
@@ -329,8 +329,11 @@ abstract class RemoteClient private[akka] (
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
 class ActiveRemoteClient private[akka] (
-  module: NettyRemoteClientModule, remoteAddress: InetSocketAddress,
-  val loader: Option[ClassLoader] = None, notifyListenersFun: (⇒ Any) ⇒ Unit) extends RemoteClient(module, remoteAddress) {
+  module: NettyRemoteClientModule,
+  remoteAddress: InetSocketAddress,
+  val loader: Option[ClassLoader] = None,
+  notifyListenersFun: (⇒ Any) ⇒ Unit)
+  extends RemoteClient(module, remoteAddress) {
 
   import RemoteClientSettings._
 
@@ -524,11 +527,13 @@ class ActiveRemoteClientHandler(
         case arp: AkkaRemoteProtocol if arp.hasMessage ⇒
           val reply = arp.getMessage
           val replyUuid = uuidFrom(reply.getActorInfo.getUuid.getHigh, reply.getActorInfo.getUuid.getLow)
-          EventHandler.debug(this, "Remote client received RemoteMessageProtocol[\n%s]\nTrying to map back to future: %s".format(reply, replyUuid))
+          EventHandler.debug(this, "Remote client received RemoteMessageProtocol[\n%s]\nTrying to map back to future [%s]".format(reply, replyUuid))
 
           futures.remove(replyUuid).asInstanceOf[Promise[Any]] match {
             case null ⇒
-              client.notifyListeners(RemoteClientError(new IllegalActorStateException("Future mapped to UUID " + replyUuid + " does not exist"), client.module, client.remoteAddress))
+              client.notifyListeners(RemoteClientError(
+                new IllegalActorStateException("Future mapped to UUID " + replyUuid + " does not exist"), client.module,
+                client.remoteAddress))
 
             case future ⇒
               if (reply.hasMessage) {
@@ -1075,11 +1080,17 @@ class RemoteServerHandler(
       "Looking up a remotely available actor for address [%s] on node [%s]"
         .format(address, Config.nodename))
 
-    val actorRef = createSessionActor(actorInfo, channel)
-
-    if (actorRef eq null) throw new IllegalActorStateException("Could not find a remote actor with address [" + address + "] or uuid [" + uuid + "]")
-
-    actorRef
+    val byAddress = server.actors.get(address) // try actor-by-address
+    if (byAddress eq null) {
+      val byUuid = server.actorsByUuid.get(uuid) // try actor-by-uuid
+      if (byUuid eq null) {
+        val bySession = createSessionActor(actorInfo, channel) // try actor-by-session
+        if (bySession eq null) {
+          throw new IllegalActorStateException(
+            "Could not find a remote actor with address [" + address + "] or uuid [" + uuid + "]")
+        } else bySession
+      } else byUuid
+    } else byAddress
   }
 
   /**