diff --git a/akka-actor-tests/src/test/java/akka/actor/JavaAPI.java b/akka-actor-tests/src/test/java/akka/actor/JavaAPI.java
index 741cc0bb00..5bf4e5b5c8 100644
--- a/akka-actor-tests/src/test/java/akka/actor/JavaAPI.java
+++ b/akka-actor-tests/src/test/java/akka/actor/JavaAPI.java
@@ -3,7 +3,7 @@ package akka.actor;
 import akka.japi.Creator;
 import org.junit.Test;
 import akka.actor.Actors;
-import akka.remoteinterface.RemoteSupport;
+import akka.cluster.RemoteSupport;
 import static org.junit.Assert.*;
 
 public class JavaAPI {
diff --git a/akka-actor-tests/src/test/scala/akka/actor/actor/ClusterSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/actor/ClusterSpec.scala
index 36a0ff76e3..7432dc9630 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/actor/ClusterSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/actor/ClusterSpec.scala
@@ -23,7 +23,7 @@ class ClusterSpec extends WordSpec with MustMatchers {
       getBool("akka.cluster.include-ref-node-in-replica-set") must equal(Some(true))
       getString("akka.cluster.compression-scheme") must equal(Some(""))
       getInt("akka.cluster.zlib-compression-level") must equal(Some(6))
-      getString("akka.cluster.layer") must equal(Some("akka.remote.netty.NettyRemoteSupport"))
+      getString("akka.cluster.layer") must equal(Some("akka.cluster.netty.NettyRemoteSupport"))
       getString("akka.cluster.secure-cookie") must equal(Some(""))
       getString("akka.cluster.log-directory") must equal(Some("_akka_cluster"))
 
@@ -38,7 +38,7 @@ class ClusterSpec extends WordSpec with MustMatchers {
       //akka.cluster.server
       getInt("akka.cluster.server.port") must equal(Some(2552))
       getInt("akka.cluster.server.message-frame-size") must equal(Some(1048576))
-      getInt("akka.cluster.server.connection-timeout") must equal(Some(100))
+      getInt("akka.cluster.server.connection-timeout") must equal(Some(120))
       getBool("akka.cluster.server.require-cookie") must equal(Some(false))
       getBool("akka.cluster.server.untrusted-mode") must equal(Some(false))
       getInt("akka.cluster.server.backlog") must equal(Some(4096))
@@ -51,7 +51,7 @@ class ClusterSpec extends WordSpec with MustMatchers {
       getBool("akka.cluster.client.buffering.retry-message-send-on-failure") must equal(Some(true))
       getInt("akka.cluster.client.buffering.capacity") must equal(Some(-1))
       getInt("akka.cluster.client.reconnect-delay") must equal(Some(5))
-      getInt("akka.cluster.client.read-timeout") must equal(Some(10))
+      getInt("akka.cluster.client.read-timeout") must equal(Some(3600))
       getInt("akka.cluster.client.reap-futures-delay") must equal(Some(5))
       getInt("akka.cluster.client.reconnection-time-window") must equal(Some(600))
     }
diff --git a/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala b/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala
index 1e6a70c016..449212d4f1 100644
--- a/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala
@@ -39,7 +39,7 @@ class ConfigSpec extends WordSpec with MustMatchers {
       getInt("akka.actor.throughput") must equal(Some(5))
       getInt("akka.actor.throughput-deadline-time") must equal(Some(-1))
 
-      getString("akka.cluster.layer") must equal(Some("akka.remote.netty.NettyRemoteSupport"))
+      getString("akka.cluster.layer") must equal(Some("akka.cluster.netty.NettyRemoteSupport"))
       getInt("akka.cluster.server.port") must equal(Some(2552))
     }
   }
diff --git a/akka-actor/src/main/java/akka/actor/Actors.java b/akka-actor/src/main/java/akka/actor/Actors.java
index 147585cd79..8dbaf8c60e 100644
--- a/akka-actor/src/main/java/akka/actor/Actors.java
+++ b/akka-actor/src/main/java/akka/actor/Actors.java
@@ -1,7 +1,7 @@
 package akka.actor;
 
 import akka.japi.Creator;
-import akka.remoteinterface.RemoteSupport;
+import akka.cluster.RemoteSupport;
 
 import com.eaio.uuid.UUID;
 
diff --git a/akka-actor/src/main/scala/akka/actor/Actor.scala b/akka-actor/src/main/scala/akka/actor/Actor.scala
index 6a8408f6d9..144d028306 100644
--- a/akka-actor/src/main/scala/akka/actor/Actor.scala
+++ b/akka-actor/src/main/scala/akka/actor/Actor.scala
@@ -11,7 +11,7 @@ import akka.config._
 import Config._
 import akka.util.{ ReflectiveAccess, Duration }
 import ReflectiveAccess._
-import akka.remoteinterface.RemoteSupport
+import akka.cluster.RemoteSupport
 import akka.japi.{ Creator, Procedure }
 import akka.AkkaException
 import akka.serialization.{ Serializer, Serialization }
diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
index 0a0d57b4e1..4be8c93338 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
@@ -44,7 +44,7 @@ private[akka] object ActorRefInternals {
  * ActorRef configuration object, this is threadsafe and fully sharable
  *
  * Props() returns default configuration
- * TODO document me
+ * FIXME document me
  */
 object Props {
   object Default {
@@ -91,6 +91,7 @@ case class Props(creator: () ⇒ Actor = Props.Default.creator,
     faultHandler = Props.Default.faultHandler,
     supervisor = Props.Default.supervisor,
     localOnly = Props.Default.localOnly)
+
   /**
    * Returns a new Props with the specified creator set
    *  Scala API
diff --git a/akka-actor/src/main/scala/akka/cluster/ClusterInterface.scala b/akka-actor/src/main/scala/akka/cluster/ClusterInterface.scala
index e848529a94..7ab5b8913d 100644
--- a/akka-actor/src/main/scala/akka/cluster/ClusterInterface.scala
+++ b/akka-actor/src/main/scala/akka/cluster/ClusterInterface.scala
@@ -4,7 +4,7 @@
 
 package akka.cluster
 
-import akka.remoteinterface.RemoteSupport
+import akka.cluster.RemoteSupport
 import akka.serialization.Serializer
 import akka.actor._
 import DeploymentConfig._
@@ -426,9 +426,9 @@ trait ClusterNode {
 
   // =============== PRIVATE METHODS ===============
 
-  // FIXME considering moving all these private[cluster] methods to a separate trait to get them out of the user's view
+  // FIXME BAD BAD BAD - considering moving all these private[cluster] methods to a separate trait to get them out of the user's view
 
-  private[cluster] def remoteClientLifeCycleListener: ActorRef
+  private[cluster] def remoteClientLifeCycleHandler: ActorRef
 
   private[cluster] def remoteDaemon: ActorRef
 
diff --git a/akka-actor/src/main/scala/akka/remoteinterface/RemoteEventHandler.scala b/akka-actor/src/main/scala/akka/cluster/RemoteEventHandler.scala
similarity index 98%
rename from akka-actor/src/main/scala/akka/remoteinterface/RemoteEventHandler.scala
rename to akka-actor/src/main/scala/akka/cluster/RemoteEventHandler.scala
index ee24efe99a..1068bdd837 100644
--- a/akka-actor/src/main/scala/akka/remoteinterface/RemoteEventHandler.scala
+++ b/akka-actor/src/main/scala/akka/cluster/RemoteEventHandler.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2011 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.remoteinterface
+package akka.cluster
 
 import akka.actor.Actor
 import akka.event.EventHandler
diff --git a/akka-actor/src/main/scala/akka/remoteinterface/RemoteInterface.scala b/akka-actor/src/main/scala/akka/cluster/RemoteInterface.scala
similarity index 98%
rename from akka-actor/src/main/scala/akka/remoteinterface/RemoteInterface.scala
rename to akka-actor/src/main/scala/akka/cluster/RemoteInterface.scala
index 2b18ae2676..4f945eb6f3 100644
--- a/akka-actor/src/main/scala/akka/remoteinterface/RemoteInterface.scala
+++ b/akka-actor/src/main/scala/akka/cluster/RemoteInterface.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2010 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.remoteinterface
+package akka.cluster
 
 import akka.japi.Creator
 import akka.actor._
@@ -88,10 +88,18 @@ trait RemoteModule {
   */
 }
 
+/**
+ * Remote life-cycle events.
+ */
+sealed trait RemoteLifeCycleEvent
+
 /**
  * Life-cycle events for RemoteClient.
  */
-sealed trait RemoteClientLifeCycleEvent
+trait RemoteClientLifeCycleEvent extends RemoteLifeCycleEvent {
+  def remoteAddress: InetSocketAddress
+}
+
 case class RemoteClientError(
   @BeanProperty cause: Throwable,
   @BeanProperty client: RemoteClientModule,
@@ -117,7 +125,8 @@ case class RemoteClientWriteFailed(
 /**
  *  Life-cycle events for RemoteServer.
  */
-sealed trait RemoteServerLifeCycleEvent
+trait RemoteServerLifeCycleEvent extends RemoteLifeCycleEvent
+
 case class RemoteServerStarted(
   @BeanProperty val server: RemoteServerModule) extends RemoteServerLifeCycleEvent
 case class RemoteServerShutdown(
diff --git a/akka-actor/src/main/scala/akka/routing/Routing.scala b/akka-actor/src/main/scala/akka/routing/Routing.scala
index e6e6d9a806..31e8f0b6f9 100644
--- a/akka-actor/src/main/scala/akka/routing/Routing.scala
+++ b/akka-actor/src/main/scala/akka/routing/Routing.scala
@@ -133,13 +133,13 @@ trait RouterConnections {
    * reasons this can happen is that multiple thread could at the 'same' moment discover for the same ActorRef that
    * not working.
    *
-   * It could be that even after a signalDeadActor has been called for a specific ActorRef, that the ActorRef
+   * It could be that even after a remove has been called for a specific ActorRef, that the ActorRef
    * is still being used. A good behaving Router will eventually discard this reference, but no guarantees are
    * made how long this takes place.
    *
    * @param ref the dead
    */
-  def signalDeadActor(deadRef: ActorRef): Unit
+  def remove(deadRef: ActorRef): Unit
 }
 
 object Routing {
@@ -250,7 +250,7 @@ class RoutedActorRef(val address: String, val router: Router, val connectionIter
     }
 
     @tailrec
-    final def signalDeadActor(ref: ActorRef) = {
+    final def remove(ref: ActorRef) = {
       val oldState = state.get()
 
       //remote the ref from the connections.
@@ -261,7 +261,7 @@ class RoutedActorRef(val address: String, val router: Router, val connectionIter
 
         val newState = new State(oldState.version + 1, newList)
         //if we are not able to update the state, we just try again.
-        if (!state.compareAndSet(oldState, newState)) signalDeadActor(ref)
+        if (!state.compareAndSet(oldState, newState)) remove(ref)
       }
     }
 
@@ -293,7 +293,7 @@ trait BasicRouter extends Router {
           actor.!(message)(sender)
         } catch {
           case e: Exception ⇒
-            connections.signalDeadActor(actor)
+            connections.remove(actor)
             throw e
         })
     case _ ⇒
@@ -304,7 +304,7 @@ trait BasicRouter extends Router {
             actor.!(message)(sender)
           } catch {
             case e: Exception ⇒
-              connections.signalDeadActor(actor)
+              connections.remove(actor)
               throw e
           }
         case None ⇒
@@ -323,7 +323,7 @@ trait BasicRouter extends Router {
             actor.?(message, timeout)(sender).asInstanceOf[Future[T]]
           } catch {
             case e: Exception ⇒
-              connections.signalDeadActor(actor)
+              connections.remove(actor)
               throw e
           }
         case None ⇒
@@ -505,7 +505,7 @@ trait ScatterGatherRouter extends BasicRouter with Serializable {
         Some(actor.?(message, timeout)(sender).asInstanceOf[Future[S]])
       } catch {
         case e: Exception ⇒
-          connections.signalDeadActor(actor)
+          connections.remove(actor)
           None
       }
     }
diff --git a/akka-actor/src/main/scala/akka/util/ReflectiveAccess.scala b/akka-actor/src/main/scala/akka/util/ReflectiveAccess.scala
index f7a2f2a249..0941a4ce37 100644
--- a/akka-actor/src/main/scala/akka/util/ReflectiveAccess.scala
+++ b/akka-actor/src/main/scala/akka/util/ReflectiveAccess.scala
@@ -6,7 +6,7 @@ package akka.util
 
 import akka.dispatch.MessageInvocation
 import akka.config.{ Config, ModuleNotAvailableException }
-import akka.remoteinterface.RemoteSupport
+import akka.cluster.RemoteSupport
 import akka.actor._
 import DeploymentConfig.ReplicationScheme
 import akka.event.EventHandler
@@ -122,7 +122,7 @@ object ReflectiveAccess {
    * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
    */
   object RemoteModule {
-    val TRANSPORT = Config.config.getString("akka.remote.layer", "akka.remote.netty.NettyRemoteSupport")
+    val TRANSPORT = Config.config.getString("akka.cluster.layer", "akka.cluster.netty.NettyRemoteSupport")
 
     val configDefaultAddress = new InetSocketAddress(Config.hostname, Config.remoteServerPort)
 
diff --git a/akka-cluster/src/main/java/akka/remote/protocol/RemoteProtocol.java b/akka-cluster/src/main/java/akka/remote/protocol/RemoteProtocol.java
index d8067222dd..d0b0a4d959 100644
--- a/akka-cluster/src/main/java/akka/remote/protocol/RemoteProtocol.java
+++ b/akka-cluster/src/main/java/akka/remote/protocol/RemoteProtocol.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: RemoteProtocol.proto
 
-package akka.remote.protocol;
+package akka.cluster.protocol;
 
 public final class RemoteProtocol {
   private RemoteProtocol() {}
@@ -50,7 +50,7 @@ public final class RemoteProtocol {
     }
     public static final com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
-      return akka.remote.protocol.RemoteProtocol.getDescriptor().getEnumTypes().get(0);
+      return akka.cluster.protocol.RemoteProtocol.getDescriptor().getEnumTypes().get(0);
     }
     
     private static final CommandType[] VALUES = {
@@ -122,7 +122,7 @@ public final class RemoteProtocol {
     }
     public static final com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
-      return akka.remote.protocol.RemoteProtocol.getDescriptor().getEnumTypes().get(1);
+      return akka.cluster.protocol.RemoteProtocol.getDescriptor().getEnumTypes().get(1);
     }
     
     private static final ReplicationStorageType[] VALUES = {
@@ -191,7 +191,7 @@ public final class RemoteProtocol {
     }
     public static final com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
-      return akka.remote.protocol.RemoteProtocol.getDescriptor().getEnumTypes().get(2);
+      return akka.cluster.protocol.RemoteProtocol.getDescriptor().getEnumTypes().get(2);
     }
     
     private static final ReplicationStrategyType[] VALUES = {
@@ -269,7 +269,7 @@ public final class RemoteProtocol {
     }
     public static final com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
-      return akka.remote.protocol.RemoteProtocol.getDescriptor().getEnumTypes().get(3);
+      return akka.cluster.protocol.RemoteProtocol.getDescriptor().getEnumTypes().get(3);
     }
     
     private static final SerializationSchemeType[] VALUES = {
@@ -338,7 +338,7 @@ public final class RemoteProtocol {
     }
     public static final com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
-      return akka.remote.protocol.RemoteProtocol.getDescriptor().getEnumTypes().get(4);
+      return akka.cluster.protocol.RemoteProtocol.getDescriptor().getEnumTypes().get(4);
     }
     
     private static final LifeCycleType[] VALUES = {
@@ -370,13 +370,13 @@ public final class RemoteProtocol {
     
     // optional .RemoteMessageProtocol message = 1;
     boolean hasMessage();
-    akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol getMessage();
-    akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder getMessageOrBuilder();
+    akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol getMessage();
+    akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder getMessageOrBuilder();
     
     // optional .RemoteControlProtocol instruction = 2;
     boolean hasInstruction();
-    akka.remote.protocol.RemoteProtocol.RemoteControlProtocol getInstruction();
-    akka.remote.protocol.RemoteProtocol.RemoteControlProtocolOrBuilder getInstructionOrBuilder();
+    akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol getInstruction();
+    akka.cluster.protocol.RemoteProtocol.RemoteControlProtocolOrBuilder getInstructionOrBuilder();
   }
   public static final class AkkaRemoteProtocol extends
       com.google.protobuf.GeneratedMessage
@@ -398,44 +398,44 @@ public final class RemoteProtocol {
     
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.protocol.RemoteProtocol.internal_static_AkkaRemoteProtocol_descriptor;
+      return akka.cluster.protocol.RemoteProtocol.internal_static_AkkaRemoteProtocol_descriptor;
     }
     
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.protocol.RemoteProtocol.internal_static_AkkaRemoteProtocol_fieldAccessorTable;
+      return akka.cluster.protocol.RemoteProtocol.internal_static_AkkaRemoteProtocol_fieldAccessorTable;
     }
     
     private int bitField0_;
     // optional .RemoteMessageProtocol message = 1;
     public static final int MESSAGE_FIELD_NUMBER = 1;
-    private akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol message_;
+    private akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol message_;
     public boolean hasMessage() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
-    public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol getMessage() {
+    public akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol getMessage() {
       return message_;
     }
-    public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder getMessageOrBuilder() {
+    public akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder getMessageOrBuilder() {
       return message_;
     }
     
     // optional .RemoteControlProtocol instruction = 2;
     public static final int INSTRUCTION_FIELD_NUMBER = 2;
-    private akka.remote.protocol.RemoteProtocol.RemoteControlProtocol instruction_;
+    private akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol instruction_;
     public boolean hasInstruction() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
-    public akka.remote.protocol.RemoteProtocol.RemoteControlProtocol getInstruction() {
+    public akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol getInstruction() {
       return instruction_;
     }
-    public akka.remote.protocol.RemoteProtocol.RemoteControlProtocolOrBuilder getInstructionOrBuilder() {
+    public akka.cluster.protocol.RemoteProtocol.RemoteControlProtocolOrBuilder getInstructionOrBuilder() {
       return instruction_;
     }
     
     private void initFields() {
-      message_ = akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance();
-      instruction_ = akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.getDefaultInstance();
+      message_ = akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance();
+      instruction_ = akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -496,41 +496,41 @@ public final class RemoteProtocol {
       return super.writeReplace();
     }
     
-    public static akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol parseFrom(byte[] data)
+    public static akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol parseFrom(java.io.InputStream input)
+    public static akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol parseDelimitedFrom(java.io.InputStream input)
+    public static akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       Builder builder = newBuilder();
       if (builder.mergeDelimitedFrom(input)) {
@@ -539,7 +539,7 @@ public final class RemoteProtocol {
         return null;
       }
     }
-    public static akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol parseDelimitedFrom(
+    public static akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -550,12 +550,12 @@ public final class RemoteProtocol {
         return null;
       }
     }
-    public static akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -565,7 +565,7 @@ public final class RemoteProtocol {
     
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol prototype) {
+    public static Builder newBuilder(akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -578,18 +578,18 @@ public final class RemoteProtocol {
     }
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocolOrBuilder {
+       implements akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocolOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.protocol.RemoteProtocol.internal_static_AkkaRemoteProtocol_descriptor;
+        return akka.cluster.protocol.RemoteProtocol.internal_static_AkkaRemoteProtocol_descriptor;
       }
       
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.protocol.RemoteProtocol.internal_static_AkkaRemoteProtocol_fieldAccessorTable;
+        return akka.cluster.protocol.RemoteProtocol.internal_static_AkkaRemoteProtocol_fieldAccessorTable;
       }
       
-      // Construct using akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol.newBuilder()
+      // Construct using akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -611,13 +611,13 @@ public final class RemoteProtocol {
       public Builder clear() {
         super.clear();
         if (messageBuilder_ == null) {
-          message_ = akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance();
+          message_ = akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance();
         } else {
           messageBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000001);
         if (instructionBuilder_ == null) {
-          instruction_ = akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.getDefaultInstance();
+          instruction_ = akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol.getDefaultInstance();
         } else {
           instructionBuilder_.clear();
         }
@@ -631,24 +631,24 @@ public final class RemoteProtocol {
       
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol.getDescriptor();
+        return akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol.getDescriptor();
       }
       
-      public akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol getDefaultInstanceForType() {
-        return akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol.getDefaultInstance();
+      public akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol getDefaultInstanceForType() {
+        return akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol.getDefaultInstance();
       }
       
-      public akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol build() {
-        akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol result = buildPartial();
+      public akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol build() {
+        akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
       
-      private akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol buildParsed()
+      private akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol result = buildPartial();
+        akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
@@ -656,8 +656,8 @@ public final class RemoteProtocol {
         return result;
       }
       
-      public akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol buildPartial() {
-        akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol result = new akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol(this);
+      public akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol buildPartial() {
+        akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol result = new akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -682,16 +682,16 @@ public final class RemoteProtocol {
       }
       
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol) {
-          return mergeFrom((akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol)other);
+        if (other instanceof akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol) {
+          return mergeFrom((akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
       
-      public Builder mergeFrom(akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol other) {
-        if (other == akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol.getDefaultInstance()) return this;
+      public Builder mergeFrom(akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol other) {
+        if (other == akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol.getDefaultInstance()) return this;
         if (other.hasMessage()) {
           mergeMessage(other.getMessage());
         }
@@ -742,7 +742,7 @@ public final class RemoteProtocol {
               break;
             }
             case 10: {
-              akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder subBuilder = akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.newBuilder();
+              akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.Builder subBuilder = akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.newBuilder();
               if (hasMessage()) {
                 subBuilder.mergeFrom(getMessage());
               }
@@ -751,7 +751,7 @@ public final class RemoteProtocol {
               break;
             }
             case 18: {
-              akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.Builder subBuilder = akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.newBuilder();
+              akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol.Builder subBuilder = akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol.newBuilder();
               if (hasInstruction()) {
                 subBuilder.mergeFrom(getInstruction());
               }
@@ -766,20 +766,20 @@ public final class RemoteProtocol {
       private int bitField0_;
       
       // optional .RemoteMessageProtocol message = 1;
-      private akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol message_ = akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance();
+      private akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol message_ = akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder> messageBuilder_;
+          akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol, akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.Builder, akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder> messageBuilder_;
       public boolean hasMessage() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
-      public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol getMessage() {
+      public akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol getMessage() {
         if (messageBuilder_ == null) {
           return message_;
         } else {
           return messageBuilder_.getMessage();
         }
       }
-      public Builder setMessage(akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol value) {
+      public Builder setMessage(akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol value) {
         if (messageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -793,7 +793,7 @@ public final class RemoteProtocol {
         return this;
       }
       public Builder setMessage(
-          akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder builderForValue) {
+          akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.Builder builderForValue) {
         if (messageBuilder_ == null) {
           message_ = builderForValue.build();
           onChanged();
@@ -803,12 +803,12 @@ public final class RemoteProtocol {
         bitField0_ |= 0x00000001;
         return this;
       }
-      public Builder mergeMessage(akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol value) {
+      public Builder mergeMessage(akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol value) {
         if (messageBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              message_ != akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance()) {
+              message_ != akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance()) {
             message_ =
-              akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.newBuilder(message_).mergeFrom(value).buildPartial();
+              akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.newBuilder(message_).mergeFrom(value).buildPartial();
           } else {
             message_ = value;
           }
@@ -821,7 +821,7 @@ public final class RemoteProtocol {
       }
       public Builder clearMessage() {
         if (messageBuilder_ == null) {
-          message_ = akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance();
+          message_ = akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance();
           onChanged();
         } else {
           messageBuilder_.clear();
@@ -829,12 +829,12 @@ public final class RemoteProtocol {
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
-      public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder getMessageBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.Builder getMessageBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getMessageFieldBuilder().getBuilder();
       }
-      public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder getMessageOrBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder getMessageOrBuilder() {
         if (messageBuilder_ != null) {
           return messageBuilder_.getMessageOrBuilder();
         } else {
@@ -842,11 +842,11 @@ public final class RemoteProtocol {
         }
       }
       private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder> 
+          akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol, akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.Builder, akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder> 
           getMessageFieldBuilder() {
         if (messageBuilder_ == null) {
           messageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder>(
+              akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol, akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.Builder, akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder>(
                   message_,
                   getParentForChildren(),
                   isClean());
@@ -856,20 +856,20 @@ public final class RemoteProtocol {
       }
       
       // optional .RemoteControlProtocol instruction = 2;
-      private akka.remote.protocol.RemoteProtocol.RemoteControlProtocol instruction_ = akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.getDefaultInstance();
+      private akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol instruction_ = akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.RemoteControlProtocol, akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteControlProtocolOrBuilder> instructionBuilder_;
+          akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol, akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol.Builder, akka.cluster.protocol.RemoteProtocol.RemoteControlProtocolOrBuilder> instructionBuilder_;
       public boolean hasInstruction() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
-      public akka.remote.protocol.RemoteProtocol.RemoteControlProtocol getInstruction() {
+      public akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol getInstruction() {
         if (instructionBuilder_ == null) {
           return instruction_;
         } else {
           return instructionBuilder_.getMessage();
         }
       }
-      public Builder setInstruction(akka.remote.protocol.RemoteProtocol.RemoteControlProtocol value) {
+      public Builder setInstruction(akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol value) {
         if (instructionBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -883,7 +883,7 @@ public final class RemoteProtocol {
         return this;
       }
       public Builder setInstruction(
-          akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.Builder builderForValue) {
+          akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol.Builder builderForValue) {
         if (instructionBuilder_ == null) {
           instruction_ = builderForValue.build();
           onChanged();
@@ -893,12 +893,12 @@ public final class RemoteProtocol {
         bitField0_ |= 0x00000002;
         return this;
       }
-      public Builder mergeInstruction(akka.remote.protocol.RemoteProtocol.RemoteControlProtocol value) {
+      public Builder mergeInstruction(akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol value) {
         if (instructionBuilder_ == null) {
           if (((bitField0_ & 0x00000002) == 0x00000002) &&
-              instruction_ != akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.getDefaultInstance()) {
+              instruction_ != akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol.getDefaultInstance()) {
             instruction_ =
-              akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.newBuilder(instruction_).mergeFrom(value).buildPartial();
+              akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol.newBuilder(instruction_).mergeFrom(value).buildPartial();
           } else {
             instruction_ = value;
           }
@@ -911,7 +911,7 @@ public final class RemoteProtocol {
       }
       public Builder clearInstruction() {
         if (instructionBuilder_ == null) {
-          instruction_ = akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.getDefaultInstance();
+          instruction_ = akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol.getDefaultInstance();
           onChanged();
         } else {
           instructionBuilder_.clear();
@@ -919,12 +919,12 @@ public final class RemoteProtocol {
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
-      public akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.Builder getInstructionBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol.Builder getInstructionBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getInstructionFieldBuilder().getBuilder();
       }
-      public akka.remote.protocol.RemoteProtocol.RemoteControlProtocolOrBuilder getInstructionOrBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.RemoteControlProtocolOrBuilder getInstructionOrBuilder() {
         if (instructionBuilder_ != null) {
           return instructionBuilder_.getMessageOrBuilder();
         } else {
@@ -932,11 +932,11 @@ public final class RemoteProtocol {
         }
       }
       private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.RemoteControlProtocol, akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteControlProtocolOrBuilder> 
+          akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol, akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol.Builder, akka.cluster.protocol.RemoteProtocol.RemoteControlProtocolOrBuilder> 
           getInstructionFieldBuilder() {
         if (instructionBuilder_ == null) {
           instructionBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.protocol.RemoteProtocol.RemoteControlProtocol, akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteControlProtocolOrBuilder>(
+              akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol, akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol.Builder, akka.cluster.protocol.RemoteProtocol.RemoteControlProtocolOrBuilder>(
                   instruction_,
                   getParentForChildren(),
                   isClean());
@@ -961,13 +961,13 @@ public final class RemoteProtocol {
     
     // required .UuidProtocol uuid = 1;
     boolean hasUuid();
-    akka.remote.protocol.RemoteProtocol.UuidProtocol getUuid();
-    akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder();
+    akka.cluster.protocol.RemoteProtocol.UuidProtocol getUuid();
+    akka.cluster.protocol.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder();
     
     // required .ActorInfoProtocol actorInfo = 2;
     boolean hasActorInfo();
-    akka.remote.protocol.RemoteProtocol.ActorInfoProtocol getActorInfo();
-    akka.remote.protocol.RemoteProtocol.ActorInfoProtocolOrBuilder getActorInfoOrBuilder();
+    akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol getActorInfo();
+    akka.cluster.protocol.RemoteProtocol.ActorInfoProtocolOrBuilder getActorInfoOrBuilder();
     
     // required bool oneWay = 3;
     boolean hasOneWay();
@@ -975,32 +975,32 @@ public final class RemoteProtocol {
     
     // optional .MessageProtocol message = 4;
     boolean hasMessage();
-    akka.remote.protocol.RemoteProtocol.MessageProtocol getMessage();
-    akka.remote.protocol.RemoteProtocol.MessageProtocolOrBuilder getMessageOrBuilder();
+    akka.cluster.protocol.RemoteProtocol.MessageProtocol getMessage();
+    akka.cluster.protocol.RemoteProtocol.MessageProtocolOrBuilder getMessageOrBuilder();
     
     // optional .ExceptionProtocol exception = 5;
     boolean hasException();
-    akka.remote.protocol.RemoteProtocol.ExceptionProtocol getException();
-    akka.remote.protocol.RemoteProtocol.ExceptionProtocolOrBuilder getExceptionOrBuilder();
+    akka.cluster.protocol.RemoteProtocol.ExceptionProtocol getException();
+    akka.cluster.protocol.RemoteProtocol.ExceptionProtocolOrBuilder getExceptionOrBuilder();
     
     // optional .UuidProtocol supervisorUuid = 6;
     boolean hasSupervisorUuid();
-    akka.remote.protocol.RemoteProtocol.UuidProtocol getSupervisorUuid();
-    akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder getSupervisorUuidOrBuilder();
+    akka.cluster.protocol.RemoteProtocol.UuidProtocol getSupervisorUuid();
+    akka.cluster.protocol.RemoteProtocol.UuidProtocolOrBuilder getSupervisorUuidOrBuilder();
     
     // optional .RemoteActorRefProtocol sender = 7;
     boolean hasSender();
-    akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol getSender();
-    akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder getSenderOrBuilder();
+    akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol getSender();
+    akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder getSenderOrBuilder();
     
     // repeated .MetadataEntryProtocol metadata = 8;
-    java.util.List<akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol> 
+    java.util.List<akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol> 
         getMetadataList();
-    akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol getMetadata(int index);
+    akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol getMetadata(int index);
     int getMetadataCount();
-    java.util.List<? extends akka.remote.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder> 
+    java.util.List<? extends akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder> 
         getMetadataOrBuilderList();
-    akka.remote.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder getMetadataOrBuilder(
+    akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder getMetadataOrBuilder(
         int index);
   }
   public static final class RemoteMessageProtocol extends
@@ -1023,38 +1023,38 @@ public final class RemoteProtocol {
     
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.protocol.RemoteProtocol.internal_static_RemoteMessageProtocol_descriptor;
+      return akka.cluster.protocol.RemoteProtocol.internal_static_RemoteMessageProtocol_descriptor;
     }
     
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.protocol.RemoteProtocol.internal_static_RemoteMessageProtocol_fieldAccessorTable;
+      return akka.cluster.protocol.RemoteProtocol.internal_static_RemoteMessageProtocol_fieldAccessorTable;
     }
     
     private int bitField0_;
     // required .UuidProtocol uuid = 1;
     public static final int UUID_FIELD_NUMBER = 1;
-    private akka.remote.protocol.RemoteProtocol.UuidProtocol uuid_;
+    private akka.cluster.protocol.RemoteProtocol.UuidProtocol uuid_;
     public boolean hasUuid() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
-    public akka.remote.protocol.RemoteProtocol.UuidProtocol getUuid() {
+    public akka.cluster.protocol.RemoteProtocol.UuidProtocol getUuid() {
       return uuid_;
     }
-    public akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder() {
+    public akka.cluster.protocol.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder() {
       return uuid_;
     }
     
     // required .ActorInfoProtocol actorInfo = 2;
     public static final int ACTORINFO_FIELD_NUMBER = 2;
-    private akka.remote.protocol.RemoteProtocol.ActorInfoProtocol actorInfo_;
+    private akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol actorInfo_;
     public boolean hasActorInfo() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
-    public akka.remote.protocol.RemoteProtocol.ActorInfoProtocol getActorInfo() {
+    public akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol getActorInfo() {
       return actorInfo_;
     }
-    public akka.remote.protocol.RemoteProtocol.ActorInfoProtocolOrBuilder getActorInfoOrBuilder() {
+    public akka.cluster.protocol.RemoteProtocol.ActorInfoProtocolOrBuilder getActorInfoOrBuilder() {
       return actorInfo_;
     }
     
@@ -1070,85 +1070,85 @@ public final class RemoteProtocol {
     
     // optional .MessageProtocol message = 4;
     public static final int MESSAGE_FIELD_NUMBER = 4;
-    private akka.remote.protocol.RemoteProtocol.MessageProtocol message_;
+    private akka.cluster.protocol.RemoteProtocol.MessageProtocol message_;
     public boolean hasMessage() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
-    public akka.remote.protocol.RemoteProtocol.MessageProtocol getMessage() {
+    public akka.cluster.protocol.RemoteProtocol.MessageProtocol getMessage() {
       return message_;
     }
-    public akka.remote.protocol.RemoteProtocol.MessageProtocolOrBuilder getMessageOrBuilder() {
+    public akka.cluster.protocol.RemoteProtocol.MessageProtocolOrBuilder getMessageOrBuilder() {
       return message_;
     }
     
     // optional .ExceptionProtocol exception = 5;
     public static final int EXCEPTION_FIELD_NUMBER = 5;
-    private akka.remote.protocol.RemoteProtocol.ExceptionProtocol exception_;
+    private akka.cluster.protocol.RemoteProtocol.ExceptionProtocol exception_;
     public boolean hasException() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
-    public akka.remote.protocol.RemoteProtocol.ExceptionProtocol getException() {
+    public akka.cluster.protocol.RemoteProtocol.ExceptionProtocol getException() {
       return exception_;
     }
-    public akka.remote.protocol.RemoteProtocol.ExceptionProtocolOrBuilder getExceptionOrBuilder() {
+    public akka.cluster.protocol.RemoteProtocol.ExceptionProtocolOrBuilder getExceptionOrBuilder() {
       return exception_;
     }
     
     // optional .UuidProtocol supervisorUuid = 6;
     public static final int SUPERVISORUUID_FIELD_NUMBER = 6;
-    private akka.remote.protocol.RemoteProtocol.UuidProtocol supervisorUuid_;
+    private akka.cluster.protocol.RemoteProtocol.UuidProtocol supervisorUuid_;
     public boolean hasSupervisorUuid() {
       return ((bitField0_ & 0x00000020) == 0x00000020);
     }
-    public akka.remote.protocol.RemoteProtocol.UuidProtocol getSupervisorUuid() {
+    public akka.cluster.protocol.RemoteProtocol.UuidProtocol getSupervisorUuid() {
       return supervisorUuid_;
     }
-    public akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder getSupervisorUuidOrBuilder() {
+    public akka.cluster.protocol.RemoteProtocol.UuidProtocolOrBuilder getSupervisorUuidOrBuilder() {
       return supervisorUuid_;
     }
     
     // optional .RemoteActorRefProtocol sender = 7;
     public static final int SENDER_FIELD_NUMBER = 7;
-    private akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol sender_;
+    private akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol sender_;
     public boolean hasSender() {
       return ((bitField0_ & 0x00000040) == 0x00000040);
     }
-    public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol getSender() {
+    public akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol getSender() {
       return sender_;
     }
-    public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder getSenderOrBuilder() {
+    public akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder getSenderOrBuilder() {
       return sender_;
     }
     
     // repeated .MetadataEntryProtocol metadata = 8;
     public static final int METADATA_FIELD_NUMBER = 8;
-    private java.util.List<akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol> metadata_;
-    public java.util.List<akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol> getMetadataList() {
+    private java.util.List<akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol> metadata_;
+    public java.util.List<akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol> getMetadataList() {
       return metadata_;
     }
-    public java.util.List<? extends akka.remote.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder> 
+    public java.util.List<? extends akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder> 
         getMetadataOrBuilderList() {
       return metadata_;
     }
     public int getMetadataCount() {
       return metadata_.size();
     }
-    public akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol getMetadata(int index) {
+    public akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol getMetadata(int index) {
       return metadata_.get(index);
     }
-    public akka.remote.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder getMetadataOrBuilder(
+    public akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder getMetadataOrBuilder(
         int index) {
       return metadata_.get(index);
     }
     
     private void initFields() {
-      uuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
-      actorInfo_ = akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.getDefaultInstance();
+      uuid_ = akka.cluster.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+      actorInfo_ = akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol.getDefaultInstance();
       oneWay_ = false;
-      message_ = akka.remote.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance();
-      exception_ = akka.remote.protocol.RemoteProtocol.ExceptionProtocol.getDefaultInstance();
-      supervisorUuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
-      sender_ = akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
+      message_ = akka.cluster.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance();
+      exception_ = akka.cluster.protocol.RemoteProtocol.ExceptionProtocol.getDefaultInstance();
+      supervisorUuid_ = akka.cluster.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+      sender_ = akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
       metadata_ = java.util.Collections.emptyList();
     }
     private byte memoizedIsInitialized = -1;
@@ -1290,41 +1290,41 @@ public final class RemoteProtocol {
       return super.writeReplace();
     }
     
-    public static akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol parseFrom(byte[] data)
+    public static akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol parseFrom(java.io.InputStream input)
+    public static akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol parseDelimitedFrom(java.io.InputStream input)
+    public static akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       Builder builder = newBuilder();
       if (builder.mergeDelimitedFrom(input)) {
@@ -1333,7 +1333,7 @@ public final class RemoteProtocol {
         return null;
       }
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol parseDelimitedFrom(
+    public static akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1344,12 +1344,12 @@ public final class RemoteProtocol {
         return null;
       }
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1359,7 +1359,7 @@ public final class RemoteProtocol {
     
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol prototype) {
+    public static Builder newBuilder(akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -1372,18 +1372,18 @@ public final class RemoteProtocol {
     }
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder {
+       implements akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.protocol.RemoteProtocol.internal_static_RemoteMessageProtocol_descriptor;
+        return akka.cluster.protocol.RemoteProtocol.internal_static_RemoteMessageProtocol_descriptor;
       }
       
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.protocol.RemoteProtocol.internal_static_RemoteMessageProtocol_fieldAccessorTable;
+        return akka.cluster.protocol.RemoteProtocol.internal_static_RemoteMessageProtocol_fieldAccessorTable;
       }
       
-      // Construct using akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.newBuilder()
+      // Construct using akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -1410,13 +1410,13 @@ public final class RemoteProtocol {
       public Builder clear() {
         super.clear();
         if (uuidBuilder_ == null) {
-          uuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+          uuid_ = akka.cluster.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
         } else {
           uuidBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000001);
         if (actorInfoBuilder_ == null) {
-          actorInfo_ = akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.getDefaultInstance();
+          actorInfo_ = akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol.getDefaultInstance();
         } else {
           actorInfoBuilder_.clear();
         }
@@ -1424,25 +1424,25 @@ public final class RemoteProtocol {
         oneWay_ = false;
         bitField0_ = (bitField0_ & ~0x00000004);
         if (messageBuilder_ == null) {
-          message_ = akka.remote.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance();
+          message_ = akka.cluster.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance();
         } else {
           messageBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000008);
         if (exceptionBuilder_ == null) {
-          exception_ = akka.remote.protocol.RemoteProtocol.ExceptionProtocol.getDefaultInstance();
+          exception_ = akka.cluster.protocol.RemoteProtocol.ExceptionProtocol.getDefaultInstance();
         } else {
           exceptionBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000010);
         if (supervisorUuidBuilder_ == null) {
-          supervisorUuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+          supervisorUuid_ = akka.cluster.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
         } else {
           supervisorUuidBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000020);
         if (senderBuilder_ == null) {
-          sender_ = akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
+          sender_ = akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
         } else {
           senderBuilder_.clear();
         }
@@ -1462,24 +1462,24 @@ public final class RemoteProtocol {
       
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.getDescriptor();
+        return akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.getDescriptor();
       }
       
-      public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol getDefaultInstanceForType() {
-        return akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance();
+      public akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol getDefaultInstanceForType() {
+        return akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance();
       }
       
-      public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol build() {
-        akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol result = buildPartial();
+      public akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol build() {
+        akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
       
-      private akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol buildParsed()
+      private akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol result = buildPartial();
+        akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
@@ -1487,8 +1487,8 @@ public final class RemoteProtocol {
         return result;
       }
       
-      public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol buildPartial() {
-        akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol result = new akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol(this);
+      public akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol buildPartial() {
+        akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol result = new akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -1558,16 +1558,16 @@ public final class RemoteProtocol {
       }
       
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol) {
-          return mergeFrom((akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol)other);
+        if (other instanceof akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol) {
+          return mergeFrom((akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
       
-      public Builder mergeFrom(akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol other) {
-        if (other == akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance()) return this;
+      public Builder mergeFrom(akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol other) {
+        if (other == akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance()) return this;
         if (other.hasUuid()) {
           mergeUuid(other.getUuid());
         }
@@ -1697,7 +1697,7 @@ public final class RemoteProtocol {
               break;
             }
             case 10: {
-              akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder subBuilder = akka.remote.protocol.RemoteProtocol.UuidProtocol.newBuilder();
+              akka.cluster.protocol.RemoteProtocol.UuidProtocol.Builder subBuilder = akka.cluster.protocol.RemoteProtocol.UuidProtocol.newBuilder();
               if (hasUuid()) {
                 subBuilder.mergeFrom(getUuid());
               }
@@ -1706,7 +1706,7 @@ public final class RemoteProtocol {
               break;
             }
             case 18: {
-              akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.Builder subBuilder = akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.newBuilder();
+              akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol.Builder subBuilder = akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol.newBuilder();
               if (hasActorInfo()) {
                 subBuilder.mergeFrom(getActorInfo());
               }
@@ -1720,7 +1720,7 @@ public final class RemoteProtocol {
               break;
             }
             case 34: {
-              akka.remote.protocol.RemoteProtocol.MessageProtocol.Builder subBuilder = akka.remote.protocol.RemoteProtocol.MessageProtocol.newBuilder();
+              akka.cluster.protocol.RemoteProtocol.MessageProtocol.Builder subBuilder = akka.cluster.protocol.RemoteProtocol.MessageProtocol.newBuilder();
               if (hasMessage()) {
                 subBuilder.mergeFrom(getMessage());
               }
@@ -1729,7 +1729,7 @@ public final class RemoteProtocol {
               break;
             }
             case 42: {
-              akka.remote.protocol.RemoteProtocol.ExceptionProtocol.Builder subBuilder = akka.remote.protocol.RemoteProtocol.ExceptionProtocol.newBuilder();
+              akka.cluster.protocol.RemoteProtocol.ExceptionProtocol.Builder subBuilder = akka.cluster.protocol.RemoteProtocol.ExceptionProtocol.newBuilder();
               if (hasException()) {
                 subBuilder.mergeFrom(getException());
               }
@@ -1738,7 +1738,7 @@ public final class RemoteProtocol {
               break;
             }
             case 50: {
-              akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder subBuilder = akka.remote.protocol.RemoteProtocol.UuidProtocol.newBuilder();
+              akka.cluster.protocol.RemoteProtocol.UuidProtocol.Builder subBuilder = akka.cluster.protocol.RemoteProtocol.UuidProtocol.newBuilder();
               if (hasSupervisorUuid()) {
                 subBuilder.mergeFrom(getSupervisorUuid());
               }
@@ -1747,7 +1747,7 @@ public final class RemoteProtocol {
               break;
             }
             case 58: {
-              akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder subBuilder = akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.newBuilder();
+              akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder subBuilder = akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.newBuilder();
               if (hasSender()) {
                 subBuilder.mergeFrom(getSender());
               }
@@ -1756,7 +1756,7 @@ public final class RemoteProtocol {
               break;
             }
             case 66: {
-              akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.Builder subBuilder = akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.newBuilder();
+              akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol.Builder subBuilder = akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol.newBuilder();
               input.readMessage(subBuilder, extensionRegistry);
               addMetadata(subBuilder.buildPartial());
               break;
@@ -1768,20 +1768,20 @@ public final class RemoteProtocol {
       private int bitField0_;
       
       // required .UuidProtocol uuid = 1;
-      private akka.remote.protocol.RemoteProtocol.UuidProtocol uuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+      private akka.cluster.protocol.RemoteProtocol.UuidProtocol uuid_ = akka.cluster.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.UuidProtocol, akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder, akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder> uuidBuilder_;
+          akka.cluster.protocol.RemoteProtocol.UuidProtocol, akka.cluster.protocol.RemoteProtocol.UuidProtocol.Builder, akka.cluster.protocol.RemoteProtocol.UuidProtocolOrBuilder> uuidBuilder_;
       public boolean hasUuid() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
-      public akka.remote.protocol.RemoteProtocol.UuidProtocol getUuid() {
+      public akka.cluster.protocol.RemoteProtocol.UuidProtocol getUuid() {
         if (uuidBuilder_ == null) {
           return uuid_;
         } else {
           return uuidBuilder_.getMessage();
         }
       }
-      public Builder setUuid(akka.remote.protocol.RemoteProtocol.UuidProtocol value) {
+      public Builder setUuid(akka.cluster.protocol.RemoteProtocol.UuidProtocol value) {
         if (uuidBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1795,7 +1795,7 @@ public final class RemoteProtocol {
         return this;
       }
       public Builder setUuid(
-          akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder builderForValue) {
+          akka.cluster.protocol.RemoteProtocol.UuidProtocol.Builder builderForValue) {
         if (uuidBuilder_ == null) {
           uuid_ = builderForValue.build();
           onChanged();
@@ -1805,12 +1805,12 @@ public final class RemoteProtocol {
         bitField0_ |= 0x00000001;
         return this;
       }
-      public Builder mergeUuid(akka.remote.protocol.RemoteProtocol.UuidProtocol value) {
+      public Builder mergeUuid(akka.cluster.protocol.RemoteProtocol.UuidProtocol value) {
         if (uuidBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              uuid_ != akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance()) {
+              uuid_ != akka.cluster.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance()) {
             uuid_ =
-              akka.remote.protocol.RemoteProtocol.UuidProtocol.newBuilder(uuid_).mergeFrom(value).buildPartial();
+              akka.cluster.protocol.RemoteProtocol.UuidProtocol.newBuilder(uuid_).mergeFrom(value).buildPartial();
           } else {
             uuid_ = value;
           }
@@ -1823,7 +1823,7 @@ public final class RemoteProtocol {
       }
       public Builder clearUuid() {
         if (uuidBuilder_ == null) {
-          uuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+          uuid_ = akka.cluster.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
           onChanged();
         } else {
           uuidBuilder_.clear();
@@ -1831,12 +1831,12 @@ public final class RemoteProtocol {
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
-      public akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder getUuidBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.UuidProtocol.Builder getUuidBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getUuidFieldBuilder().getBuilder();
       }
-      public akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder() {
         if (uuidBuilder_ != null) {
           return uuidBuilder_.getMessageOrBuilder();
         } else {
@@ -1844,11 +1844,11 @@ public final class RemoteProtocol {
         }
       }
       private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.UuidProtocol, akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder, akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder> 
+          akka.cluster.protocol.RemoteProtocol.UuidProtocol, akka.cluster.protocol.RemoteProtocol.UuidProtocol.Builder, akka.cluster.protocol.RemoteProtocol.UuidProtocolOrBuilder> 
           getUuidFieldBuilder() {
         if (uuidBuilder_ == null) {
           uuidBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.protocol.RemoteProtocol.UuidProtocol, akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder, akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder>(
+              akka.cluster.protocol.RemoteProtocol.UuidProtocol, akka.cluster.protocol.RemoteProtocol.UuidProtocol.Builder, akka.cluster.protocol.RemoteProtocol.UuidProtocolOrBuilder>(
                   uuid_,
                   getParentForChildren(),
                   isClean());
@@ -1858,20 +1858,20 @@ public final class RemoteProtocol {
       }
       
       // required .ActorInfoProtocol actorInfo = 2;
-      private akka.remote.protocol.RemoteProtocol.ActorInfoProtocol actorInfo_ = akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.getDefaultInstance();
+      private akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol actorInfo_ = akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.ActorInfoProtocol, akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.Builder, akka.remote.protocol.RemoteProtocol.ActorInfoProtocolOrBuilder> actorInfoBuilder_;
+          akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol, akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol.Builder, akka.cluster.protocol.RemoteProtocol.ActorInfoProtocolOrBuilder> actorInfoBuilder_;
       public boolean hasActorInfo() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
-      public akka.remote.protocol.RemoteProtocol.ActorInfoProtocol getActorInfo() {
+      public akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol getActorInfo() {
         if (actorInfoBuilder_ == null) {
           return actorInfo_;
         } else {
           return actorInfoBuilder_.getMessage();
         }
       }
-      public Builder setActorInfo(akka.remote.protocol.RemoteProtocol.ActorInfoProtocol value) {
+      public Builder setActorInfo(akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol value) {
         if (actorInfoBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1885,7 +1885,7 @@ public final class RemoteProtocol {
         return this;
       }
       public Builder setActorInfo(
-          akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.Builder builderForValue) {
+          akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol.Builder builderForValue) {
         if (actorInfoBuilder_ == null) {
           actorInfo_ = builderForValue.build();
           onChanged();
@@ -1895,12 +1895,12 @@ public final class RemoteProtocol {
         bitField0_ |= 0x00000002;
         return this;
       }
-      public Builder mergeActorInfo(akka.remote.protocol.RemoteProtocol.ActorInfoProtocol value) {
+      public Builder mergeActorInfo(akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol value) {
         if (actorInfoBuilder_ == null) {
           if (((bitField0_ & 0x00000002) == 0x00000002) &&
-              actorInfo_ != akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.getDefaultInstance()) {
+              actorInfo_ != akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol.getDefaultInstance()) {
             actorInfo_ =
-              akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.newBuilder(actorInfo_).mergeFrom(value).buildPartial();
+              akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol.newBuilder(actorInfo_).mergeFrom(value).buildPartial();
           } else {
             actorInfo_ = value;
           }
@@ -1913,7 +1913,7 @@ public final class RemoteProtocol {
       }
       public Builder clearActorInfo() {
         if (actorInfoBuilder_ == null) {
-          actorInfo_ = akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.getDefaultInstance();
+          actorInfo_ = akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol.getDefaultInstance();
           onChanged();
         } else {
           actorInfoBuilder_.clear();
@@ -1921,12 +1921,12 @@ public final class RemoteProtocol {
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
-      public akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.Builder getActorInfoBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol.Builder getActorInfoBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getActorInfoFieldBuilder().getBuilder();
       }
-      public akka.remote.protocol.RemoteProtocol.ActorInfoProtocolOrBuilder getActorInfoOrBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.ActorInfoProtocolOrBuilder getActorInfoOrBuilder() {
         if (actorInfoBuilder_ != null) {
           return actorInfoBuilder_.getMessageOrBuilder();
         } else {
@@ -1934,11 +1934,11 @@ public final class RemoteProtocol {
         }
       }
       private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.ActorInfoProtocol, akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.Builder, akka.remote.protocol.RemoteProtocol.ActorInfoProtocolOrBuilder> 
+          akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol, akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol.Builder, akka.cluster.protocol.RemoteProtocol.ActorInfoProtocolOrBuilder> 
           getActorInfoFieldBuilder() {
         if (actorInfoBuilder_ == null) {
           actorInfoBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.protocol.RemoteProtocol.ActorInfoProtocol, akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.Builder, akka.remote.protocol.RemoteProtocol.ActorInfoProtocolOrBuilder>(
+              akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol, akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol.Builder, akka.cluster.protocol.RemoteProtocol.ActorInfoProtocolOrBuilder>(
                   actorInfo_,
                   getParentForChildren(),
                   isClean());
@@ -1969,20 +1969,20 @@ public final class RemoteProtocol {
       }
       
       // optional .MessageProtocol message = 4;
-      private akka.remote.protocol.RemoteProtocol.MessageProtocol message_ = akka.remote.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance();
+      private akka.cluster.protocol.RemoteProtocol.MessageProtocol message_ = akka.cluster.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.MessageProtocol, akka.remote.protocol.RemoteProtocol.MessageProtocol.Builder, akka.remote.protocol.RemoteProtocol.MessageProtocolOrBuilder> messageBuilder_;
+          akka.cluster.protocol.RemoteProtocol.MessageProtocol, akka.cluster.protocol.RemoteProtocol.MessageProtocol.Builder, akka.cluster.protocol.RemoteProtocol.MessageProtocolOrBuilder> messageBuilder_;
       public boolean hasMessage() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
-      public akka.remote.protocol.RemoteProtocol.MessageProtocol getMessage() {
+      public akka.cluster.protocol.RemoteProtocol.MessageProtocol getMessage() {
         if (messageBuilder_ == null) {
           return message_;
         } else {
           return messageBuilder_.getMessage();
         }
       }
-      public Builder setMessage(akka.remote.protocol.RemoteProtocol.MessageProtocol value) {
+      public Builder setMessage(akka.cluster.protocol.RemoteProtocol.MessageProtocol value) {
         if (messageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1996,7 +1996,7 @@ public final class RemoteProtocol {
         return this;
       }
       public Builder setMessage(
-          akka.remote.protocol.RemoteProtocol.MessageProtocol.Builder builderForValue) {
+          akka.cluster.protocol.RemoteProtocol.MessageProtocol.Builder builderForValue) {
         if (messageBuilder_ == null) {
           message_ = builderForValue.build();
           onChanged();
@@ -2006,12 +2006,12 @@ public final class RemoteProtocol {
         bitField0_ |= 0x00000008;
         return this;
       }
-      public Builder mergeMessage(akka.remote.protocol.RemoteProtocol.MessageProtocol value) {
+      public Builder mergeMessage(akka.cluster.protocol.RemoteProtocol.MessageProtocol value) {
         if (messageBuilder_ == null) {
           if (((bitField0_ & 0x00000008) == 0x00000008) &&
-              message_ != akka.remote.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance()) {
+              message_ != akka.cluster.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance()) {
             message_ =
-              akka.remote.protocol.RemoteProtocol.MessageProtocol.newBuilder(message_).mergeFrom(value).buildPartial();
+              akka.cluster.protocol.RemoteProtocol.MessageProtocol.newBuilder(message_).mergeFrom(value).buildPartial();
           } else {
             message_ = value;
           }
@@ -2024,7 +2024,7 @@ public final class RemoteProtocol {
       }
       public Builder clearMessage() {
         if (messageBuilder_ == null) {
-          message_ = akka.remote.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance();
+          message_ = akka.cluster.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance();
           onChanged();
         } else {
           messageBuilder_.clear();
@@ -2032,12 +2032,12 @@ public final class RemoteProtocol {
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
-      public akka.remote.protocol.RemoteProtocol.MessageProtocol.Builder getMessageBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.MessageProtocol.Builder getMessageBuilder() {
         bitField0_ |= 0x00000008;
         onChanged();
         return getMessageFieldBuilder().getBuilder();
       }
-      public akka.remote.protocol.RemoteProtocol.MessageProtocolOrBuilder getMessageOrBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.MessageProtocolOrBuilder getMessageOrBuilder() {
         if (messageBuilder_ != null) {
           return messageBuilder_.getMessageOrBuilder();
         } else {
@@ -2045,11 +2045,11 @@ public final class RemoteProtocol {
         }
       }
       private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.MessageProtocol, akka.remote.protocol.RemoteProtocol.MessageProtocol.Builder, akka.remote.protocol.RemoteProtocol.MessageProtocolOrBuilder> 
+          akka.cluster.protocol.RemoteProtocol.MessageProtocol, akka.cluster.protocol.RemoteProtocol.MessageProtocol.Builder, akka.cluster.protocol.RemoteProtocol.MessageProtocolOrBuilder> 
           getMessageFieldBuilder() {
         if (messageBuilder_ == null) {
           messageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.protocol.RemoteProtocol.MessageProtocol, akka.remote.protocol.RemoteProtocol.MessageProtocol.Builder, akka.remote.protocol.RemoteProtocol.MessageProtocolOrBuilder>(
+              akka.cluster.protocol.RemoteProtocol.MessageProtocol, akka.cluster.protocol.RemoteProtocol.MessageProtocol.Builder, akka.cluster.protocol.RemoteProtocol.MessageProtocolOrBuilder>(
                   message_,
                   getParentForChildren(),
                   isClean());
@@ -2059,20 +2059,20 @@ public final class RemoteProtocol {
       }
       
       // optional .ExceptionProtocol exception = 5;
-      private akka.remote.protocol.RemoteProtocol.ExceptionProtocol exception_ = akka.remote.protocol.RemoteProtocol.ExceptionProtocol.getDefaultInstance();
+      private akka.cluster.protocol.RemoteProtocol.ExceptionProtocol exception_ = akka.cluster.protocol.RemoteProtocol.ExceptionProtocol.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.ExceptionProtocol, akka.remote.protocol.RemoteProtocol.ExceptionProtocol.Builder, akka.remote.protocol.RemoteProtocol.ExceptionProtocolOrBuilder> exceptionBuilder_;
+          akka.cluster.protocol.RemoteProtocol.ExceptionProtocol, akka.cluster.protocol.RemoteProtocol.ExceptionProtocol.Builder, akka.cluster.protocol.RemoteProtocol.ExceptionProtocolOrBuilder> exceptionBuilder_;
       public boolean hasException() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
-      public akka.remote.protocol.RemoteProtocol.ExceptionProtocol getException() {
+      public akka.cluster.protocol.RemoteProtocol.ExceptionProtocol getException() {
         if (exceptionBuilder_ == null) {
           return exception_;
         } else {
           return exceptionBuilder_.getMessage();
         }
       }
-      public Builder setException(akka.remote.protocol.RemoteProtocol.ExceptionProtocol value) {
+      public Builder setException(akka.cluster.protocol.RemoteProtocol.ExceptionProtocol value) {
         if (exceptionBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2086,7 +2086,7 @@ public final class RemoteProtocol {
         return this;
       }
       public Builder setException(
-          akka.remote.protocol.RemoteProtocol.ExceptionProtocol.Builder builderForValue) {
+          akka.cluster.protocol.RemoteProtocol.ExceptionProtocol.Builder builderForValue) {
         if (exceptionBuilder_ == null) {
           exception_ = builderForValue.build();
           onChanged();
@@ -2096,12 +2096,12 @@ public final class RemoteProtocol {
         bitField0_ |= 0x00000010;
         return this;
       }
-      public Builder mergeException(akka.remote.protocol.RemoteProtocol.ExceptionProtocol value) {
+      public Builder mergeException(akka.cluster.protocol.RemoteProtocol.ExceptionProtocol value) {
         if (exceptionBuilder_ == null) {
           if (((bitField0_ & 0x00000010) == 0x00000010) &&
-              exception_ != akka.remote.protocol.RemoteProtocol.ExceptionProtocol.getDefaultInstance()) {
+              exception_ != akka.cluster.protocol.RemoteProtocol.ExceptionProtocol.getDefaultInstance()) {
             exception_ =
-              akka.remote.protocol.RemoteProtocol.ExceptionProtocol.newBuilder(exception_).mergeFrom(value).buildPartial();
+              akka.cluster.protocol.RemoteProtocol.ExceptionProtocol.newBuilder(exception_).mergeFrom(value).buildPartial();
           } else {
             exception_ = value;
           }
@@ -2114,7 +2114,7 @@ public final class RemoteProtocol {
       }
       public Builder clearException() {
         if (exceptionBuilder_ == null) {
-          exception_ = akka.remote.protocol.RemoteProtocol.ExceptionProtocol.getDefaultInstance();
+          exception_ = akka.cluster.protocol.RemoteProtocol.ExceptionProtocol.getDefaultInstance();
           onChanged();
         } else {
           exceptionBuilder_.clear();
@@ -2122,12 +2122,12 @@ public final class RemoteProtocol {
         bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
-      public akka.remote.protocol.RemoteProtocol.ExceptionProtocol.Builder getExceptionBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.ExceptionProtocol.Builder getExceptionBuilder() {
         bitField0_ |= 0x00000010;
         onChanged();
         return getExceptionFieldBuilder().getBuilder();
       }
-      public akka.remote.protocol.RemoteProtocol.ExceptionProtocolOrBuilder getExceptionOrBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.ExceptionProtocolOrBuilder getExceptionOrBuilder() {
         if (exceptionBuilder_ != null) {
           return exceptionBuilder_.getMessageOrBuilder();
         } else {
@@ -2135,11 +2135,11 @@ public final class RemoteProtocol {
         }
       }
       private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.ExceptionProtocol, akka.remote.protocol.RemoteProtocol.ExceptionProtocol.Builder, akka.remote.protocol.RemoteProtocol.ExceptionProtocolOrBuilder> 
+          akka.cluster.protocol.RemoteProtocol.ExceptionProtocol, akka.cluster.protocol.RemoteProtocol.ExceptionProtocol.Builder, akka.cluster.protocol.RemoteProtocol.ExceptionProtocolOrBuilder> 
           getExceptionFieldBuilder() {
         if (exceptionBuilder_ == null) {
           exceptionBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.protocol.RemoteProtocol.ExceptionProtocol, akka.remote.protocol.RemoteProtocol.ExceptionProtocol.Builder, akka.remote.protocol.RemoteProtocol.ExceptionProtocolOrBuilder>(
+              akka.cluster.protocol.RemoteProtocol.ExceptionProtocol, akka.cluster.protocol.RemoteProtocol.ExceptionProtocol.Builder, akka.cluster.protocol.RemoteProtocol.ExceptionProtocolOrBuilder>(
                   exception_,
                   getParentForChildren(),
                   isClean());
@@ -2149,20 +2149,20 @@ public final class RemoteProtocol {
       }
       
       // optional .UuidProtocol supervisorUuid = 6;
-      private akka.remote.protocol.RemoteProtocol.UuidProtocol supervisorUuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+      private akka.cluster.protocol.RemoteProtocol.UuidProtocol supervisorUuid_ = akka.cluster.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.UuidProtocol, akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder, akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder> supervisorUuidBuilder_;
+          akka.cluster.protocol.RemoteProtocol.UuidProtocol, akka.cluster.protocol.RemoteProtocol.UuidProtocol.Builder, akka.cluster.protocol.RemoteProtocol.UuidProtocolOrBuilder> supervisorUuidBuilder_;
       public boolean hasSupervisorUuid() {
         return ((bitField0_ & 0x00000020) == 0x00000020);
       }
-      public akka.remote.protocol.RemoteProtocol.UuidProtocol getSupervisorUuid() {
+      public akka.cluster.protocol.RemoteProtocol.UuidProtocol getSupervisorUuid() {
         if (supervisorUuidBuilder_ == null) {
           return supervisorUuid_;
         } else {
           return supervisorUuidBuilder_.getMessage();
         }
       }
-      public Builder setSupervisorUuid(akka.remote.protocol.RemoteProtocol.UuidProtocol value) {
+      public Builder setSupervisorUuid(akka.cluster.protocol.RemoteProtocol.UuidProtocol value) {
         if (supervisorUuidBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2176,7 +2176,7 @@ public final class RemoteProtocol {
         return this;
       }
       public Builder setSupervisorUuid(
-          akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder builderForValue) {
+          akka.cluster.protocol.RemoteProtocol.UuidProtocol.Builder builderForValue) {
         if (supervisorUuidBuilder_ == null) {
           supervisorUuid_ = builderForValue.build();
           onChanged();
@@ -2186,12 +2186,12 @@ public final class RemoteProtocol {
         bitField0_ |= 0x00000020;
         return this;
       }
-      public Builder mergeSupervisorUuid(akka.remote.protocol.RemoteProtocol.UuidProtocol value) {
+      public Builder mergeSupervisorUuid(akka.cluster.protocol.RemoteProtocol.UuidProtocol value) {
         if (supervisorUuidBuilder_ == null) {
           if (((bitField0_ & 0x00000020) == 0x00000020) &&
-              supervisorUuid_ != akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance()) {
+              supervisorUuid_ != akka.cluster.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance()) {
             supervisorUuid_ =
-              akka.remote.protocol.RemoteProtocol.UuidProtocol.newBuilder(supervisorUuid_).mergeFrom(value).buildPartial();
+              akka.cluster.protocol.RemoteProtocol.UuidProtocol.newBuilder(supervisorUuid_).mergeFrom(value).buildPartial();
           } else {
             supervisorUuid_ = value;
           }
@@ -2204,7 +2204,7 @@ public final class RemoteProtocol {
       }
       public Builder clearSupervisorUuid() {
         if (supervisorUuidBuilder_ == null) {
-          supervisorUuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+          supervisorUuid_ = akka.cluster.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
           onChanged();
         } else {
           supervisorUuidBuilder_.clear();
@@ -2212,12 +2212,12 @@ public final class RemoteProtocol {
         bitField0_ = (bitField0_ & ~0x00000020);
         return this;
       }
-      public akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder getSupervisorUuidBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.UuidProtocol.Builder getSupervisorUuidBuilder() {
         bitField0_ |= 0x00000020;
         onChanged();
         return getSupervisorUuidFieldBuilder().getBuilder();
       }
-      public akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder getSupervisorUuidOrBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.UuidProtocolOrBuilder getSupervisorUuidOrBuilder() {
         if (supervisorUuidBuilder_ != null) {
           return supervisorUuidBuilder_.getMessageOrBuilder();
         } else {
@@ -2225,11 +2225,11 @@ public final class RemoteProtocol {
         }
       }
       private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.UuidProtocol, akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder, akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder> 
+          akka.cluster.protocol.RemoteProtocol.UuidProtocol, akka.cluster.protocol.RemoteProtocol.UuidProtocol.Builder, akka.cluster.protocol.RemoteProtocol.UuidProtocolOrBuilder> 
           getSupervisorUuidFieldBuilder() {
         if (supervisorUuidBuilder_ == null) {
           supervisorUuidBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.protocol.RemoteProtocol.UuidProtocol, akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder, akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder>(
+              akka.cluster.protocol.RemoteProtocol.UuidProtocol, akka.cluster.protocol.RemoteProtocol.UuidProtocol.Builder, akka.cluster.protocol.RemoteProtocol.UuidProtocolOrBuilder>(
                   supervisorUuid_,
                   getParentForChildren(),
                   isClean());
@@ -2239,20 +2239,20 @@ public final class RemoteProtocol {
       }
       
       // optional .RemoteActorRefProtocol sender = 7;
-      private akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol sender_ = akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
+      private akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol sender_ = akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol, akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder> senderBuilder_;
+          akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol, akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder, akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder> senderBuilder_;
       public boolean hasSender() {
         return ((bitField0_ & 0x00000040) == 0x00000040);
       }
-      public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol getSender() {
+      public akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol getSender() {
         if (senderBuilder_ == null) {
           return sender_;
         } else {
           return senderBuilder_.getMessage();
         }
       }
-      public Builder setSender(akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol value) {
+      public Builder setSender(akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol value) {
         if (senderBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2266,7 +2266,7 @@ public final class RemoteProtocol {
         return this;
       }
       public Builder setSender(
-          akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder builderForValue) {
+          akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder builderForValue) {
         if (senderBuilder_ == null) {
           sender_ = builderForValue.build();
           onChanged();
@@ -2276,12 +2276,12 @@ public final class RemoteProtocol {
         bitField0_ |= 0x00000040;
         return this;
       }
-      public Builder mergeSender(akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol value) {
+      public Builder mergeSender(akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol value) {
         if (senderBuilder_ == null) {
           if (((bitField0_ & 0x00000040) == 0x00000040) &&
-              sender_ != akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance()) {
+              sender_ != akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance()) {
             sender_ =
-              akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.newBuilder(sender_).mergeFrom(value).buildPartial();
+              akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.newBuilder(sender_).mergeFrom(value).buildPartial();
           } else {
             sender_ = value;
           }
@@ -2294,7 +2294,7 @@ public final class RemoteProtocol {
       }
       public Builder clearSender() {
         if (senderBuilder_ == null) {
-          sender_ = akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
+          sender_ = akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
           onChanged();
         } else {
           senderBuilder_.clear();
@@ -2302,12 +2302,12 @@ public final class RemoteProtocol {
         bitField0_ = (bitField0_ & ~0x00000040);
         return this;
       }
-      public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder getSenderBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder getSenderBuilder() {
         bitField0_ |= 0x00000040;
         onChanged();
         return getSenderFieldBuilder().getBuilder();
       }
-      public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder getSenderOrBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder getSenderOrBuilder() {
         if (senderBuilder_ != null) {
           return senderBuilder_.getMessageOrBuilder();
         } else {
@@ -2315,11 +2315,11 @@ public final class RemoteProtocol {
         }
       }
       private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol, akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder> 
+          akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol, akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder, akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder> 
           getSenderFieldBuilder() {
         if (senderBuilder_ == null) {
           senderBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol, akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder>(
+              akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol, akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder, akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder>(
                   sender_,
                   getParentForChildren(),
                   isClean());
@@ -2329,19 +2329,19 @@ public final class RemoteProtocol {
       }
       
       // repeated .MetadataEntryProtocol metadata = 8;
-      private java.util.List<akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol> metadata_ =
+      private java.util.List<akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol> metadata_ =
         java.util.Collections.emptyList();
       private void ensureMetadataIsMutable() {
         if (!((bitField0_ & 0x00000080) == 0x00000080)) {
-          metadata_ = new java.util.ArrayList<akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol>(metadata_);
+          metadata_ = new java.util.ArrayList<akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol>(metadata_);
           bitField0_ |= 0x00000080;
          }
       }
       
       private com.google.protobuf.RepeatedFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol, akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.Builder, akka.remote.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder> metadataBuilder_;
+          akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol, akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol.Builder, akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder> metadataBuilder_;
       
-      public java.util.List<akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol> getMetadataList() {
+      public java.util.List<akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol> getMetadataList() {
         if (metadataBuilder_ == null) {
           return java.util.Collections.unmodifiableList(metadata_);
         } else {
@@ -2355,7 +2355,7 @@ public final class RemoteProtocol {
           return metadataBuilder_.getCount();
         }
       }
-      public akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol getMetadata(int index) {
+      public akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol getMetadata(int index) {
         if (metadataBuilder_ == null) {
           return metadata_.get(index);
         } else {
@@ -2363,7 +2363,7 @@ public final class RemoteProtocol {
         }
       }
       public Builder setMetadata(
-          int index, akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol value) {
+          int index, akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol value) {
         if (metadataBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2377,7 +2377,7 @@ public final class RemoteProtocol {
         return this;
       }
       public Builder setMetadata(
-          int index, akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.Builder builderForValue) {
+          int index, akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol.Builder builderForValue) {
         if (metadataBuilder_ == null) {
           ensureMetadataIsMutable();
           metadata_.set(index, builderForValue.build());
@@ -2387,7 +2387,7 @@ public final class RemoteProtocol {
         }
         return this;
       }
-      public Builder addMetadata(akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol value) {
+      public Builder addMetadata(akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol value) {
         if (metadataBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2401,7 +2401,7 @@ public final class RemoteProtocol {
         return this;
       }
       public Builder addMetadata(
-          int index, akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol value) {
+          int index, akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol value) {
         if (metadataBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2415,7 +2415,7 @@ public final class RemoteProtocol {
         return this;
       }
       public Builder addMetadata(
-          akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.Builder builderForValue) {
+          akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol.Builder builderForValue) {
         if (metadataBuilder_ == null) {
           ensureMetadataIsMutable();
           metadata_.add(builderForValue.build());
@@ -2426,7 +2426,7 @@ public final class RemoteProtocol {
         return this;
       }
       public Builder addMetadata(
-          int index, akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.Builder builderForValue) {
+          int index, akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol.Builder builderForValue) {
         if (metadataBuilder_ == null) {
           ensureMetadataIsMutable();
           metadata_.add(index, builderForValue.build());
@@ -2437,7 +2437,7 @@ public final class RemoteProtocol {
         return this;
       }
       public Builder addAllMetadata(
-          java.lang.Iterable<? extends akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol> values) {
+          java.lang.Iterable<? extends akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol> values) {
         if (metadataBuilder_ == null) {
           ensureMetadataIsMutable();
           super.addAll(values, metadata_);
@@ -2467,18 +2467,18 @@ public final class RemoteProtocol {
         }
         return this;
       }
-      public akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.Builder getMetadataBuilder(
+      public akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol.Builder getMetadataBuilder(
           int index) {
         return getMetadataFieldBuilder().getBuilder(index);
       }
-      public akka.remote.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder getMetadataOrBuilder(
+      public akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder getMetadataOrBuilder(
           int index) {
         if (metadataBuilder_ == null) {
           return metadata_.get(index);  } else {
           return metadataBuilder_.getMessageOrBuilder(index);
         }
       }
-      public java.util.List<? extends akka.remote.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder> 
+      public java.util.List<? extends akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder> 
            getMetadataOrBuilderList() {
         if (metadataBuilder_ != null) {
           return metadataBuilder_.getMessageOrBuilderList();
@@ -2486,25 +2486,25 @@ public final class RemoteProtocol {
           return java.util.Collections.unmodifiableList(metadata_);
         }
       }
-      public akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.Builder addMetadataBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol.Builder addMetadataBuilder() {
         return getMetadataFieldBuilder().addBuilder(
-            akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.getDefaultInstance());
+            akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol.getDefaultInstance());
       }
-      public akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.Builder addMetadataBuilder(
+      public akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol.Builder addMetadataBuilder(
           int index) {
         return getMetadataFieldBuilder().addBuilder(
-            index, akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.getDefaultInstance());
+            index, akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol.getDefaultInstance());
       }
-      public java.util.List<akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.Builder> 
+      public java.util.List<akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol.Builder> 
            getMetadataBuilderList() {
         return getMetadataFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol, akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.Builder, akka.remote.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder> 
+          akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol, akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol.Builder, akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder> 
           getMetadataFieldBuilder() {
         if (metadataBuilder_ == null) {
           metadataBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol, akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.Builder, akka.remote.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder>(
+              akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol, akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol.Builder, akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder>(
                   metadata_,
                   ((bitField0_ & 0x00000080) == 0x00000080),
                   getParentForChildren(),
@@ -2534,7 +2534,7 @@ public final class RemoteProtocol {
     
     // required .CommandType commandType = 2;
     boolean hasCommandType();
-    akka.remote.protocol.RemoteProtocol.CommandType getCommandType();
+    akka.cluster.protocol.RemoteProtocol.CommandType getCommandType();
   }
   public static final class RemoteControlProtocol extends
       com.google.protobuf.GeneratedMessage
@@ -2556,12 +2556,12 @@ public final class RemoteProtocol {
     
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.protocol.RemoteProtocol.internal_static_RemoteControlProtocol_descriptor;
+      return akka.cluster.protocol.RemoteProtocol.internal_static_RemoteControlProtocol_descriptor;
     }
     
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.protocol.RemoteProtocol.internal_static_RemoteControlProtocol_fieldAccessorTable;
+      return akka.cluster.protocol.RemoteProtocol.internal_static_RemoteControlProtocol_fieldAccessorTable;
     }
     
     private int bitField0_;
@@ -2599,17 +2599,17 @@ public final class RemoteProtocol {
     
     // required .CommandType commandType = 2;
     public static final int COMMANDTYPE_FIELD_NUMBER = 2;
-    private akka.remote.protocol.RemoteProtocol.CommandType commandType_;
+    private akka.cluster.protocol.RemoteProtocol.CommandType commandType_;
     public boolean hasCommandType() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
-    public akka.remote.protocol.RemoteProtocol.CommandType getCommandType() {
+    public akka.cluster.protocol.RemoteProtocol.CommandType getCommandType() {
       return commandType_;
     }
     
     private void initFields() {
       cookie_ = "";
-      commandType_ = akka.remote.protocol.RemoteProtocol.CommandType.CONNECT;
+      commandType_ = akka.cluster.protocol.RemoteProtocol.CommandType.CONNECT;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -2662,41 +2662,41 @@ public final class RemoteProtocol {
       return super.writeReplace();
     }
     
-    public static akka.remote.protocol.RemoteProtocol.RemoteControlProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteControlProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteControlProtocol parseFrom(byte[] data)
+    public static akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteControlProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteControlProtocol parseFrom(java.io.InputStream input)
+    public static akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteControlProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteControlProtocol parseDelimitedFrom(java.io.InputStream input)
+    public static akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       Builder builder = newBuilder();
       if (builder.mergeDelimitedFrom(input)) {
@@ -2705,7 +2705,7 @@ public final class RemoteProtocol {
         return null;
       }
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteControlProtocol parseDelimitedFrom(
+    public static akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2716,12 +2716,12 @@ public final class RemoteProtocol {
         return null;
       }
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteControlProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteControlProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2731,7 +2731,7 @@ public final class RemoteProtocol {
     
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.protocol.RemoteProtocol.RemoteControlProtocol prototype) {
+    public static Builder newBuilder(akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -2744,18 +2744,18 @@ public final class RemoteProtocol {
     }
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.protocol.RemoteProtocol.RemoteControlProtocolOrBuilder {
+       implements akka.cluster.protocol.RemoteProtocol.RemoteControlProtocolOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.protocol.RemoteProtocol.internal_static_RemoteControlProtocol_descriptor;
+        return akka.cluster.protocol.RemoteProtocol.internal_static_RemoteControlProtocol_descriptor;
       }
       
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.protocol.RemoteProtocol.internal_static_RemoteControlProtocol_fieldAccessorTable;
+        return akka.cluster.protocol.RemoteProtocol.internal_static_RemoteControlProtocol_fieldAccessorTable;
       }
       
-      // Construct using akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.newBuilder()
+      // Construct using akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -2776,7 +2776,7 @@ public final class RemoteProtocol {
         super.clear();
         cookie_ = "";
         bitField0_ = (bitField0_ & ~0x00000001);
-        commandType_ = akka.remote.protocol.RemoteProtocol.CommandType.CONNECT;
+        commandType_ = akka.cluster.protocol.RemoteProtocol.CommandType.CONNECT;
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
@@ -2787,24 +2787,24 @@ public final class RemoteProtocol {
       
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.getDescriptor();
+        return akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol.getDescriptor();
       }
       
-      public akka.remote.protocol.RemoteProtocol.RemoteControlProtocol getDefaultInstanceForType() {
-        return akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.getDefaultInstance();
+      public akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol getDefaultInstanceForType() {
+        return akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol.getDefaultInstance();
       }
       
-      public akka.remote.protocol.RemoteProtocol.RemoteControlProtocol build() {
-        akka.remote.protocol.RemoteProtocol.RemoteControlProtocol result = buildPartial();
+      public akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol build() {
+        akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
       
-      private akka.remote.protocol.RemoteProtocol.RemoteControlProtocol buildParsed()
+      private akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.protocol.RemoteProtocol.RemoteControlProtocol result = buildPartial();
+        akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
@@ -2812,8 +2812,8 @@ public final class RemoteProtocol {
         return result;
       }
       
-      public akka.remote.protocol.RemoteProtocol.RemoteControlProtocol buildPartial() {
-        akka.remote.protocol.RemoteProtocol.RemoteControlProtocol result = new akka.remote.protocol.RemoteProtocol.RemoteControlProtocol(this);
+      public akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol buildPartial() {
+        akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol result = new akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -2830,16 +2830,16 @@ public final class RemoteProtocol {
       }
       
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.protocol.RemoteProtocol.RemoteControlProtocol) {
-          return mergeFrom((akka.remote.protocol.RemoteProtocol.RemoteControlProtocol)other);
+        if (other instanceof akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol) {
+          return mergeFrom((akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
       
-      public Builder mergeFrom(akka.remote.protocol.RemoteProtocol.RemoteControlProtocol other) {
-        if (other == akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.getDefaultInstance()) return this;
+      public Builder mergeFrom(akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol other) {
+        if (other == akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol.getDefaultInstance()) return this;
         if (other.hasCookie()) {
           setCookie(other.getCookie());
         }
@@ -2888,7 +2888,7 @@ public final class RemoteProtocol {
             }
             case 16: {
               int rawValue = input.readEnum();
-              akka.remote.protocol.RemoteProtocol.CommandType value = akka.remote.protocol.RemoteProtocol.CommandType.valueOf(rawValue);
+              akka.cluster.protocol.RemoteProtocol.CommandType value = akka.cluster.protocol.RemoteProtocol.CommandType.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(2, rawValue);
               } else {
@@ -2940,14 +2940,14 @@ public final class RemoteProtocol {
       }
       
       // required .CommandType commandType = 2;
-      private akka.remote.protocol.RemoteProtocol.CommandType commandType_ = akka.remote.protocol.RemoteProtocol.CommandType.CONNECT;
+      private akka.cluster.protocol.RemoteProtocol.CommandType commandType_ = akka.cluster.protocol.RemoteProtocol.CommandType.CONNECT;
       public boolean hasCommandType() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
-      public akka.remote.protocol.RemoteProtocol.CommandType getCommandType() {
+      public akka.cluster.protocol.RemoteProtocol.CommandType getCommandType() {
         return commandType_;
       }
-      public Builder setCommandType(akka.remote.protocol.RemoteProtocol.CommandType value) {
+      public Builder setCommandType(akka.cluster.protocol.RemoteProtocol.CommandType value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -2958,7 +2958,7 @@ public final class RemoteProtocol {
       }
       public Builder clearCommandType() {
         bitField0_ = (bitField0_ & ~0x00000002);
-        commandType_ = akka.remote.protocol.RemoteProtocol.CommandType.CONNECT;
+        commandType_ = akka.cluster.protocol.RemoteProtocol.CommandType.CONNECT;
         onChanged();
         return this;
       }
@@ -3009,12 +3009,12 @@ public final class RemoteProtocol {
     
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.protocol.RemoteProtocol.internal_static_RemoteActorRefProtocol_descriptor;
+      return akka.cluster.protocol.RemoteProtocol.internal_static_RemoteActorRefProtocol_descriptor;
     }
     
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.protocol.RemoteProtocol.internal_static_RemoteActorRefProtocol_fieldAccessorTable;
+      return akka.cluster.protocol.RemoteProtocol.internal_static_RemoteActorRefProtocol_fieldAccessorTable;
     }
     
     private int bitField0_;
@@ -3137,41 +3137,41 @@ public final class RemoteProtocol {
       return super.writeReplace();
     }
     
-    public static akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol parseFrom(byte[] data)
+    public static akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol parseFrom(java.io.InputStream input)
+    public static akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol parseDelimitedFrom(java.io.InputStream input)
+    public static akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       Builder builder = newBuilder();
       if (builder.mergeDelimitedFrom(input)) {
@@ -3180,7 +3180,7 @@ public final class RemoteProtocol {
         return null;
       }
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol parseDelimitedFrom(
+    public static akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -3191,12 +3191,12 @@ public final class RemoteProtocol {
         return null;
       }
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -3206,7 +3206,7 @@ public final class RemoteProtocol {
     
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol prototype) {
+    public static Builder newBuilder(akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -3219,18 +3219,18 @@ public final class RemoteProtocol {
     }
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder {
+       implements akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.protocol.RemoteProtocol.internal_static_RemoteActorRefProtocol_descriptor;
+        return akka.cluster.protocol.RemoteProtocol.internal_static_RemoteActorRefProtocol_descriptor;
       }
       
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.protocol.RemoteProtocol.internal_static_RemoteActorRefProtocol_fieldAccessorTable;
+        return akka.cluster.protocol.RemoteProtocol.internal_static_RemoteActorRefProtocol_fieldAccessorTable;
       }
       
-      // Construct using akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.newBuilder()
+      // Construct using akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -3264,24 +3264,24 @@ public final class RemoteProtocol {
       
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDescriptor();
+        return akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.getDescriptor();
       }
       
-      public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol getDefaultInstanceForType() {
-        return akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
+      public akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol getDefaultInstanceForType() {
+        return akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
       }
       
-      public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol build() {
-        akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol result = buildPartial();
+      public akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol build() {
+        akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
       
-      private akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol buildParsed()
+      private akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol result = buildPartial();
+        akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
@@ -3289,8 +3289,8 @@ public final class RemoteProtocol {
         return result;
       }
       
-      public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol buildPartial() {
-        akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol result = new akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol(this);
+      public akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol buildPartial() {
+        akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol result = new akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -3311,16 +3311,16 @@ public final class RemoteProtocol {
       }
       
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol) {
-          return mergeFrom((akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol)other);
+        if (other instanceof akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol) {
+          return mergeFrom((akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
       
-      public Builder mergeFrom(akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol other) {
-        if (other == akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance()) return this;
+      public Builder mergeFrom(akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol other) {
+        if (other == akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance()) return this;
         if (other.hasAddress()) {
           setAddress(other.getAddress());
         }
@@ -3487,8 +3487,8 @@ public final class RemoteProtocol {
     
     // required .UuidProtocol uuid = 1;
     boolean hasUuid();
-    akka.remote.protocol.RemoteProtocol.UuidProtocol getUuid();
-    akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder();
+    akka.cluster.protocol.RemoteProtocol.UuidProtocol getUuid();
+    akka.cluster.protocol.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder();
     
     // required string address = 2;
     boolean hasAddress();
@@ -3516,13 +3516,13 @@ public final class RemoteProtocol {
     
     // optional .LifeCycleProtocol lifeCycle = 8;
     boolean hasLifeCycle();
-    akka.remote.protocol.RemoteProtocol.LifeCycleProtocol getLifeCycle();
-    akka.remote.protocol.RemoteProtocol.LifeCycleProtocolOrBuilder getLifeCycleOrBuilder();
+    akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol getLifeCycle();
+    akka.cluster.protocol.RemoteProtocol.LifeCycleProtocolOrBuilder getLifeCycleOrBuilder();
     
     // optional .RemoteActorRefProtocol supervisor = 9;
     boolean hasSupervisor();
-    akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol getSupervisor();
-    akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder getSupervisorOrBuilder();
+    akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol getSupervisor();
+    akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder getSupervisorOrBuilder();
     
     // optional bytes hotswapStack = 10;
     boolean hasHotswapStack();
@@ -3530,20 +3530,20 @@ public final class RemoteProtocol {
     
     // optional .ReplicationStorageType replicationStorage = 11;
     boolean hasReplicationStorage();
-    akka.remote.protocol.RemoteProtocol.ReplicationStorageType getReplicationStorage();
+    akka.cluster.protocol.RemoteProtocol.ReplicationStorageType getReplicationStorage();
     
     // optional .ReplicationStrategyType replicationStrategy = 12;
     boolean hasReplicationStrategy();
-    akka.remote.protocol.RemoteProtocol.ReplicationStrategyType getReplicationStrategy();
+    akka.cluster.protocol.RemoteProtocol.ReplicationStrategyType getReplicationStrategy();
     
     // repeated .RemoteMessageProtocol messages = 13;
-    java.util.List<akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol> 
+    java.util.List<akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol> 
         getMessagesList();
-    akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol getMessages(int index);
+    akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol getMessages(int index);
     int getMessagesCount();
-    java.util.List<? extends akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder> 
+    java.util.List<? extends akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder> 
         getMessagesOrBuilderList();
-    akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder getMessagesOrBuilder(
+    akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder getMessagesOrBuilder(
         int index);
   }
   public static final class SerializedActorRefProtocol extends
@@ -3566,25 +3566,25 @@ public final class RemoteProtocol {
     
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.protocol.RemoteProtocol.internal_static_SerializedActorRefProtocol_descriptor;
+      return akka.cluster.protocol.RemoteProtocol.internal_static_SerializedActorRefProtocol_descriptor;
     }
     
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.protocol.RemoteProtocol.internal_static_SerializedActorRefProtocol_fieldAccessorTable;
+      return akka.cluster.protocol.RemoteProtocol.internal_static_SerializedActorRefProtocol_fieldAccessorTable;
     }
     
     private int bitField0_;
     // required .UuidProtocol uuid = 1;
     public static final int UUID_FIELD_NUMBER = 1;
-    private akka.remote.protocol.RemoteProtocol.UuidProtocol uuid_;
+    private akka.cluster.protocol.RemoteProtocol.UuidProtocol uuid_;
     public boolean hasUuid() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
-    public akka.remote.protocol.RemoteProtocol.UuidProtocol getUuid() {
+    public akka.cluster.protocol.RemoteProtocol.UuidProtocol getUuid() {
       return uuid_;
     }
-    public akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder() {
+    public akka.cluster.protocol.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder() {
       return uuid_;
     }
     
@@ -3716,27 +3716,27 @@ public final class RemoteProtocol {
     
     // optional .LifeCycleProtocol lifeCycle = 8;
     public static final int LIFECYCLE_FIELD_NUMBER = 8;
-    private akka.remote.protocol.RemoteProtocol.LifeCycleProtocol lifeCycle_;
+    private akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol lifeCycle_;
     public boolean hasLifeCycle() {
       return ((bitField0_ & 0x00000080) == 0x00000080);
     }
-    public akka.remote.protocol.RemoteProtocol.LifeCycleProtocol getLifeCycle() {
+    public akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol getLifeCycle() {
       return lifeCycle_;
     }
-    public akka.remote.protocol.RemoteProtocol.LifeCycleProtocolOrBuilder getLifeCycleOrBuilder() {
+    public akka.cluster.protocol.RemoteProtocol.LifeCycleProtocolOrBuilder getLifeCycleOrBuilder() {
       return lifeCycle_;
     }
     
     // optional .RemoteActorRefProtocol supervisor = 9;
     public static final int SUPERVISOR_FIELD_NUMBER = 9;
-    private akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol supervisor_;
+    private akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol supervisor_;
     public boolean hasSupervisor() {
       return ((bitField0_ & 0x00000100) == 0x00000100);
     }
-    public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol getSupervisor() {
+    public akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol getSupervisor() {
       return supervisor_;
     }
-    public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder getSupervisorOrBuilder() {
+    public akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder getSupervisorOrBuilder() {
       return supervisor_;
     }
     
@@ -3752,58 +3752,58 @@ public final class RemoteProtocol {
     
     // optional .ReplicationStorageType replicationStorage = 11;
     public static final int REPLICATIONSTORAGE_FIELD_NUMBER = 11;
-    private akka.remote.protocol.RemoteProtocol.ReplicationStorageType replicationStorage_;
+    private akka.cluster.protocol.RemoteProtocol.ReplicationStorageType replicationStorage_;
     public boolean hasReplicationStorage() {
       return ((bitField0_ & 0x00000400) == 0x00000400);
     }
-    public akka.remote.protocol.RemoteProtocol.ReplicationStorageType getReplicationStorage() {
+    public akka.cluster.protocol.RemoteProtocol.ReplicationStorageType getReplicationStorage() {
       return replicationStorage_;
     }
     
     // optional .ReplicationStrategyType replicationStrategy = 12;
     public static final int REPLICATIONSTRATEGY_FIELD_NUMBER = 12;
-    private akka.remote.protocol.RemoteProtocol.ReplicationStrategyType replicationStrategy_;
+    private akka.cluster.protocol.RemoteProtocol.ReplicationStrategyType replicationStrategy_;
     public boolean hasReplicationStrategy() {
       return ((bitField0_ & 0x00000800) == 0x00000800);
     }
-    public akka.remote.protocol.RemoteProtocol.ReplicationStrategyType getReplicationStrategy() {
+    public akka.cluster.protocol.RemoteProtocol.ReplicationStrategyType getReplicationStrategy() {
       return replicationStrategy_;
     }
     
     // repeated .RemoteMessageProtocol messages = 13;
     public static final int MESSAGES_FIELD_NUMBER = 13;
-    private java.util.List<akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol> messages_;
-    public java.util.List<akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol> getMessagesList() {
+    private java.util.List<akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol> messages_;
+    public java.util.List<akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol> getMessagesList() {
       return messages_;
     }
-    public java.util.List<? extends akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder> 
+    public java.util.List<? extends akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder> 
         getMessagesOrBuilderList() {
       return messages_;
     }
     public int getMessagesCount() {
       return messages_.size();
     }
-    public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol getMessages(int index) {
+    public akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol getMessages(int index) {
       return messages_.get(index);
     }
-    public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder getMessagesOrBuilder(
+    public akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder getMessagesOrBuilder(
         int index) {
       return messages_.get(index);
     }
     
     private void initFields() {
-      uuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+      uuid_ = akka.cluster.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
       address_ = "";
       actorClassname_ = "";
       actorInstance_ = com.google.protobuf.ByteString.EMPTY;
       serializerClassname_ = "";
       timeout_ = 0L;
       receiveTimeout_ = 0L;
-      lifeCycle_ = akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.getDefaultInstance();
-      supervisor_ = akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
+      lifeCycle_ = akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol.getDefaultInstance();
+      supervisor_ = akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
       hotswapStack_ = com.google.protobuf.ByteString.EMPTY;
-      replicationStorage_ = akka.remote.protocol.RemoteProtocol.ReplicationStorageType.TRANSIENT;
-      replicationStrategy_ = akka.remote.protocol.RemoteProtocol.ReplicationStrategyType.WRITE_THROUGH;
+      replicationStorage_ = akka.cluster.protocol.RemoteProtocol.ReplicationStorageType.TRANSIENT;
+      replicationStrategy_ = akka.cluster.protocol.RemoteProtocol.ReplicationStrategyType.WRITE_THROUGH;
       messages_ = java.util.Collections.emptyList();
     }
     private byte memoizedIsInitialized = -1;
@@ -3964,41 +3964,41 @@ public final class RemoteProtocol {
       return super.writeReplace();
     }
     
-    public static akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol parseFrom(byte[] data)
+    public static akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol parseFrom(java.io.InputStream input)
+    public static akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol parseDelimitedFrom(java.io.InputStream input)
+    public static akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       Builder builder = newBuilder();
       if (builder.mergeDelimitedFrom(input)) {
@@ -4007,7 +4007,7 @@ public final class RemoteProtocol {
         return null;
       }
     }
-    public static akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol parseDelimitedFrom(
+    public static akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -4018,12 +4018,12 @@ public final class RemoteProtocol {
         return null;
       }
     }
-    public static akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -4033,7 +4033,7 @@ public final class RemoteProtocol {
     
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol prototype) {
+    public static Builder newBuilder(akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -4046,18 +4046,18 @@ public final class RemoteProtocol {
     }
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocolOrBuilder {
+       implements akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocolOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.protocol.RemoteProtocol.internal_static_SerializedActorRefProtocol_descriptor;
+        return akka.cluster.protocol.RemoteProtocol.internal_static_SerializedActorRefProtocol_descriptor;
       }
       
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.protocol.RemoteProtocol.internal_static_SerializedActorRefProtocol_fieldAccessorTable;
+        return akka.cluster.protocol.RemoteProtocol.internal_static_SerializedActorRefProtocol_fieldAccessorTable;
       }
       
-      // Construct using akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.newBuilder()
+      // Construct using akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -4081,7 +4081,7 @@ public final class RemoteProtocol {
       public Builder clear() {
         super.clear();
         if (uuidBuilder_ == null) {
-          uuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+          uuid_ = akka.cluster.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
         } else {
           uuidBuilder_.clear();
         }
@@ -4099,22 +4099,22 @@ public final class RemoteProtocol {
         receiveTimeout_ = 0L;
         bitField0_ = (bitField0_ & ~0x00000040);
         if (lifeCycleBuilder_ == null) {
-          lifeCycle_ = akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.getDefaultInstance();
+          lifeCycle_ = akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol.getDefaultInstance();
         } else {
           lifeCycleBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000080);
         if (supervisorBuilder_ == null) {
-          supervisor_ = akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
+          supervisor_ = akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
         } else {
           supervisorBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000100);
         hotswapStack_ = com.google.protobuf.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000200);
-        replicationStorage_ = akka.remote.protocol.RemoteProtocol.ReplicationStorageType.TRANSIENT;
+        replicationStorage_ = akka.cluster.protocol.RemoteProtocol.ReplicationStorageType.TRANSIENT;
         bitField0_ = (bitField0_ & ~0x00000400);
-        replicationStrategy_ = akka.remote.protocol.RemoteProtocol.ReplicationStrategyType.WRITE_THROUGH;
+        replicationStrategy_ = akka.cluster.protocol.RemoteProtocol.ReplicationStrategyType.WRITE_THROUGH;
         bitField0_ = (bitField0_ & ~0x00000800);
         if (messagesBuilder_ == null) {
           messages_ = java.util.Collections.emptyList();
@@ -4131,24 +4131,24 @@ public final class RemoteProtocol {
       
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.getDescriptor();
+        return akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol.getDescriptor();
       }
       
-      public akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol getDefaultInstanceForType() {
-        return akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance();
+      public akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol getDefaultInstanceForType() {
+        return akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance();
       }
       
-      public akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol build() {
-        akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol result = buildPartial();
+      public akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol build() {
+        akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
       
-      private akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol buildParsed()
+      private akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol result = buildPartial();
+        akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
@@ -4156,8 +4156,8 @@ public final class RemoteProtocol {
         return result;
       }
       
-      public akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol buildPartial() {
-        akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol result = new akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol(this);
+      public akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol buildPartial() {
+        akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol result = new akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -4235,16 +4235,16 @@ public final class RemoteProtocol {
       }
       
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol) {
-          return mergeFrom((akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol)other);
+        if (other instanceof akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol) {
+          return mergeFrom((akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
       
-      public Builder mergeFrom(akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol other) {
-        if (other == akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance()) return this;
+      public Builder mergeFrom(akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol other) {
+        if (other == akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance()) return this;
         if (other.hasUuid()) {
           mergeUuid(other.getUuid());
         }
@@ -4373,7 +4373,7 @@ public final class RemoteProtocol {
               break;
             }
             case 10: {
-              akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder subBuilder = akka.remote.protocol.RemoteProtocol.UuidProtocol.newBuilder();
+              akka.cluster.protocol.RemoteProtocol.UuidProtocol.Builder subBuilder = akka.cluster.protocol.RemoteProtocol.UuidProtocol.newBuilder();
               if (hasUuid()) {
                 subBuilder.mergeFrom(getUuid());
               }
@@ -4412,7 +4412,7 @@ public final class RemoteProtocol {
               break;
             }
             case 66: {
-              akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.Builder subBuilder = akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.newBuilder();
+              akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol.Builder subBuilder = akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol.newBuilder();
               if (hasLifeCycle()) {
                 subBuilder.mergeFrom(getLifeCycle());
               }
@@ -4421,7 +4421,7 @@ public final class RemoteProtocol {
               break;
             }
             case 74: {
-              akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder subBuilder = akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.newBuilder();
+              akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder subBuilder = akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.newBuilder();
               if (hasSupervisor()) {
                 subBuilder.mergeFrom(getSupervisor());
               }
@@ -4436,7 +4436,7 @@ public final class RemoteProtocol {
             }
             case 88: {
               int rawValue = input.readEnum();
-              akka.remote.protocol.RemoteProtocol.ReplicationStorageType value = akka.remote.protocol.RemoteProtocol.ReplicationStorageType.valueOf(rawValue);
+              akka.cluster.protocol.RemoteProtocol.ReplicationStorageType value = akka.cluster.protocol.RemoteProtocol.ReplicationStorageType.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(11, rawValue);
               } else {
@@ -4447,7 +4447,7 @@ public final class RemoteProtocol {
             }
             case 96: {
               int rawValue = input.readEnum();
-              akka.remote.protocol.RemoteProtocol.ReplicationStrategyType value = akka.remote.protocol.RemoteProtocol.ReplicationStrategyType.valueOf(rawValue);
+              akka.cluster.protocol.RemoteProtocol.ReplicationStrategyType value = akka.cluster.protocol.RemoteProtocol.ReplicationStrategyType.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(12, rawValue);
               } else {
@@ -4457,7 +4457,7 @@ public final class RemoteProtocol {
               break;
             }
             case 106: {
-              akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder subBuilder = akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.newBuilder();
+              akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.Builder subBuilder = akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.newBuilder();
               input.readMessage(subBuilder, extensionRegistry);
               addMessages(subBuilder.buildPartial());
               break;
@@ -4469,20 +4469,20 @@ public final class RemoteProtocol {
       private int bitField0_;
       
       // required .UuidProtocol uuid = 1;
-      private akka.remote.protocol.RemoteProtocol.UuidProtocol uuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+      private akka.cluster.protocol.RemoteProtocol.UuidProtocol uuid_ = akka.cluster.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.UuidProtocol, akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder, akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder> uuidBuilder_;
+          akka.cluster.protocol.RemoteProtocol.UuidProtocol, akka.cluster.protocol.RemoteProtocol.UuidProtocol.Builder, akka.cluster.protocol.RemoteProtocol.UuidProtocolOrBuilder> uuidBuilder_;
       public boolean hasUuid() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
-      public akka.remote.protocol.RemoteProtocol.UuidProtocol getUuid() {
+      public akka.cluster.protocol.RemoteProtocol.UuidProtocol getUuid() {
         if (uuidBuilder_ == null) {
           return uuid_;
         } else {
           return uuidBuilder_.getMessage();
         }
       }
-      public Builder setUuid(akka.remote.protocol.RemoteProtocol.UuidProtocol value) {
+      public Builder setUuid(akka.cluster.protocol.RemoteProtocol.UuidProtocol value) {
         if (uuidBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4496,7 +4496,7 @@ public final class RemoteProtocol {
         return this;
       }
       public Builder setUuid(
-          akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder builderForValue) {
+          akka.cluster.protocol.RemoteProtocol.UuidProtocol.Builder builderForValue) {
         if (uuidBuilder_ == null) {
           uuid_ = builderForValue.build();
           onChanged();
@@ -4506,12 +4506,12 @@ public final class RemoteProtocol {
         bitField0_ |= 0x00000001;
         return this;
       }
-      public Builder mergeUuid(akka.remote.protocol.RemoteProtocol.UuidProtocol value) {
+      public Builder mergeUuid(akka.cluster.protocol.RemoteProtocol.UuidProtocol value) {
         if (uuidBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              uuid_ != akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance()) {
+              uuid_ != akka.cluster.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance()) {
             uuid_ =
-              akka.remote.protocol.RemoteProtocol.UuidProtocol.newBuilder(uuid_).mergeFrom(value).buildPartial();
+              akka.cluster.protocol.RemoteProtocol.UuidProtocol.newBuilder(uuid_).mergeFrom(value).buildPartial();
           } else {
             uuid_ = value;
           }
@@ -4524,7 +4524,7 @@ public final class RemoteProtocol {
       }
       public Builder clearUuid() {
         if (uuidBuilder_ == null) {
-          uuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+          uuid_ = akka.cluster.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
           onChanged();
         } else {
           uuidBuilder_.clear();
@@ -4532,12 +4532,12 @@ public final class RemoteProtocol {
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
-      public akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder getUuidBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.UuidProtocol.Builder getUuidBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getUuidFieldBuilder().getBuilder();
       }
-      public akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder() {
         if (uuidBuilder_ != null) {
           return uuidBuilder_.getMessageOrBuilder();
         } else {
@@ -4545,11 +4545,11 @@ public final class RemoteProtocol {
         }
       }
       private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.UuidProtocol, akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder, akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder> 
+          akka.cluster.protocol.RemoteProtocol.UuidProtocol, akka.cluster.protocol.RemoteProtocol.UuidProtocol.Builder, akka.cluster.protocol.RemoteProtocol.UuidProtocolOrBuilder> 
           getUuidFieldBuilder() {
         if (uuidBuilder_ == null) {
           uuidBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.protocol.RemoteProtocol.UuidProtocol, akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder, akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder>(
+              akka.cluster.protocol.RemoteProtocol.UuidProtocol, akka.cluster.protocol.RemoteProtocol.UuidProtocol.Builder, akka.cluster.protocol.RemoteProtocol.UuidProtocolOrBuilder>(
                   uuid_,
                   getParentForChildren(),
                   isClean());
@@ -4733,20 +4733,20 @@ public final class RemoteProtocol {
       }
       
       // optional .LifeCycleProtocol lifeCycle = 8;
-      private akka.remote.protocol.RemoteProtocol.LifeCycleProtocol lifeCycle_ = akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.getDefaultInstance();
+      private akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol lifeCycle_ = akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.LifeCycleProtocol, akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.Builder, akka.remote.protocol.RemoteProtocol.LifeCycleProtocolOrBuilder> lifeCycleBuilder_;
+          akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol, akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol.Builder, akka.cluster.protocol.RemoteProtocol.LifeCycleProtocolOrBuilder> lifeCycleBuilder_;
       public boolean hasLifeCycle() {
         return ((bitField0_ & 0x00000080) == 0x00000080);
       }
-      public akka.remote.protocol.RemoteProtocol.LifeCycleProtocol getLifeCycle() {
+      public akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol getLifeCycle() {
         if (lifeCycleBuilder_ == null) {
           return lifeCycle_;
         } else {
           return lifeCycleBuilder_.getMessage();
         }
       }
-      public Builder setLifeCycle(akka.remote.protocol.RemoteProtocol.LifeCycleProtocol value) {
+      public Builder setLifeCycle(akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol value) {
         if (lifeCycleBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4760,7 +4760,7 @@ public final class RemoteProtocol {
         return this;
       }
       public Builder setLifeCycle(
-          akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.Builder builderForValue) {
+          akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol.Builder builderForValue) {
         if (lifeCycleBuilder_ == null) {
           lifeCycle_ = builderForValue.build();
           onChanged();
@@ -4770,12 +4770,12 @@ public final class RemoteProtocol {
         bitField0_ |= 0x00000080;
         return this;
       }
-      public Builder mergeLifeCycle(akka.remote.protocol.RemoteProtocol.LifeCycleProtocol value) {
+      public Builder mergeLifeCycle(akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol value) {
         if (lifeCycleBuilder_ == null) {
           if (((bitField0_ & 0x00000080) == 0x00000080) &&
-              lifeCycle_ != akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.getDefaultInstance()) {
+              lifeCycle_ != akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol.getDefaultInstance()) {
             lifeCycle_ =
-              akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.newBuilder(lifeCycle_).mergeFrom(value).buildPartial();
+              akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol.newBuilder(lifeCycle_).mergeFrom(value).buildPartial();
           } else {
             lifeCycle_ = value;
           }
@@ -4788,7 +4788,7 @@ public final class RemoteProtocol {
       }
       public Builder clearLifeCycle() {
         if (lifeCycleBuilder_ == null) {
-          lifeCycle_ = akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.getDefaultInstance();
+          lifeCycle_ = akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol.getDefaultInstance();
           onChanged();
         } else {
           lifeCycleBuilder_.clear();
@@ -4796,12 +4796,12 @@ public final class RemoteProtocol {
         bitField0_ = (bitField0_ & ~0x00000080);
         return this;
       }
-      public akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.Builder getLifeCycleBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol.Builder getLifeCycleBuilder() {
         bitField0_ |= 0x00000080;
         onChanged();
         return getLifeCycleFieldBuilder().getBuilder();
       }
-      public akka.remote.protocol.RemoteProtocol.LifeCycleProtocolOrBuilder getLifeCycleOrBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.LifeCycleProtocolOrBuilder getLifeCycleOrBuilder() {
         if (lifeCycleBuilder_ != null) {
           return lifeCycleBuilder_.getMessageOrBuilder();
         } else {
@@ -4809,11 +4809,11 @@ public final class RemoteProtocol {
         }
       }
       private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.LifeCycleProtocol, akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.Builder, akka.remote.protocol.RemoteProtocol.LifeCycleProtocolOrBuilder> 
+          akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol, akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol.Builder, akka.cluster.protocol.RemoteProtocol.LifeCycleProtocolOrBuilder> 
           getLifeCycleFieldBuilder() {
         if (lifeCycleBuilder_ == null) {
           lifeCycleBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.protocol.RemoteProtocol.LifeCycleProtocol, akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.Builder, akka.remote.protocol.RemoteProtocol.LifeCycleProtocolOrBuilder>(
+              akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol, akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol.Builder, akka.cluster.protocol.RemoteProtocol.LifeCycleProtocolOrBuilder>(
                   lifeCycle_,
                   getParentForChildren(),
                   isClean());
@@ -4823,20 +4823,20 @@ public final class RemoteProtocol {
       }
       
       // optional .RemoteActorRefProtocol supervisor = 9;
-      private akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol supervisor_ = akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
+      private akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol supervisor_ = akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol, akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder> supervisorBuilder_;
+          akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol, akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder, akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder> supervisorBuilder_;
       public boolean hasSupervisor() {
         return ((bitField0_ & 0x00000100) == 0x00000100);
       }
-      public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol getSupervisor() {
+      public akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol getSupervisor() {
         if (supervisorBuilder_ == null) {
           return supervisor_;
         } else {
           return supervisorBuilder_.getMessage();
         }
       }
-      public Builder setSupervisor(akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol value) {
+      public Builder setSupervisor(akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol value) {
         if (supervisorBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4850,7 +4850,7 @@ public final class RemoteProtocol {
         return this;
       }
       public Builder setSupervisor(
-          akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder builderForValue) {
+          akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder builderForValue) {
         if (supervisorBuilder_ == null) {
           supervisor_ = builderForValue.build();
           onChanged();
@@ -4860,12 +4860,12 @@ public final class RemoteProtocol {
         bitField0_ |= 0x00000100;
         return this;
       }
-      public Builder mergeSupervisor(akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol value) {
+      public Builder mergeSupervisor(akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol value) {
         if (supervisorBuilder_ == null) {
           if (((bitField0_ & 0x00000100) == 0x00000100) &&
-              supervisor_ != akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance()) {
+              supervisor_ != akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance()) {
             supervisor_ =
-              akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.newBuilder(supervisor_).mergeFrom(value).buildPartial();
+              akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.newBuilder(supervisor_).mergeFrom(value).buildPartial();
           } else {
             supervisor_ = value;
           }
@@ -4878,7 +4878,7 @@ public final class RemoteProtocol {
       }
       public Builder clearSupervisor() {
         if (supervisorBuilder_ == null) {
-          supervisor_ = akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
+          supervisor_ = akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
           onChanged();
         } else {
           supervisorBuilder_.clear();
@@ -4886,12 +4886,12 @@ public final class RemoteProtocol {
         bitField0_ = (bitField0_ & ~0x00000100);
         return this;
       }
-      public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder getSupervisorBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder getSupervisorBuilder() {
         bitField0_ |= 0x00000100;
         onChanged();
         return getSupervisorFieldBuilder().getBuilder();
       }
-      public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder getSupervisorOrBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder getSupervisorOrBuilder() {
         if (supervisorBuilder_ != null) {
           return supervisorBuilder_.getMessageOrBuilder();
         } else {
@@ -4899,11 +4899,11 @@ public final class RemoteProtocol {
         }
       }
       private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol, akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder> 
+          akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol, akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder, akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder> 
           getSupervisorFieldBuilder() {
         if (supervisorBuilder_ == null) {
           supervisorBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol, akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder>(
+              akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol, akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder, akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder>(
                   supervisor_,
                   getParentForChildren(),
                   isClean());
@@ -4937,14 +4937,14 @@ public final class RemoteProtocol {
       }
       
       // optional .ReplicationStorageType replicationStorage = 11;
-      private akka.remote.protocol.RemoteProtocol.ReplicationStorageType replicationStorage_ = akka.remote.protocol.RemoteProtocol.ReplicationStorageType.TRANSIENT;
+      private akka.cluster.protocol.RemoteProtocol.ReplicationStorageType replicationStorage_ = akka.cluster.protocol.RemoteProtocol.ReplicationStorageType.TRANSIENT;
       public boolean hasReplicationStorage() {
         return ((bitField0_ & 0x00000400) == 0x00000400);
       }
-      public akka.remote.protocol.RemoteProtocol.ReplicationStorageType getReplicationStorage() {
+      public akka.cluster.protocol.RemoteProtocol.ReplicationStorageType getReplicationStorage() {
         return replicationStorage_;
       }
-      public Builder setReplicationStorage(akka.remote.protocol.RemoteProtocol.ReplicationStorageType value) {
+      public Builder setReplicationStorage(akka.cluster.protocol.RemoteProtocol.ReplicationStorageType value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -4955,20 +4955,20 @@ public final class RemoteProtocol {
       }
       public Builder clearReplicationStorage() {
         bitField0_ = (bitField0_ & ~0x00000400);
-        replicationStorage_ = akka.remote.protocol.RemoteProtocol.ReplicationStorageType.TRANSIENT;
+        replicationStorage_ = akka.cluster.protocol.RemoteProtocol.ReplicationStorageType.TRANSIENT;
         onChanged();
         return this;
       }
       
       // optional .ReplicationStrategyType replicationStrategy = 12;
-      private akka.remote.protocol.RemoteProtocol.ReplicationStrategyType replicationStrategy_ = akka.remote.protocol.RemoteProtocol.ReplicationStrategyType.WRITE_THROUGH;
+      private akka.cluster.protocol.RemoteProtocol.ReplicationStrategyType replicationStrategy_ = akka.cluster.protocol.RemoteProtocol.ReplicationStrategyType.WRITE_THROUGH;
       public boolean hasReplicationStrategy() {
         return ((bitField0_ & 0x00000800) == 0x00000800);
       }
-      public akka.remote.protocol.RemoteProtocol.ReplicationStrategyType getReplicationStrategy() {
+      public akka.cluster.protocol.RemoteProtocol.ReplicationStrategyType getReplicationStrategy() {
         return replicationStrategy_;
       }
-      public Builder setReplicationStrategy(akka.remote.protocol.RemoteProtocol.ReplicationStrategyType value) {
+      public Builder setReplicationStrategy(akka.cluster.protocol.RemoteProtocol.ReplicationStrategyType value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -4979,25 +4979,25 @@ public final class RemoteProtocol {
       }
       public Builder clearReplicationStrategy() {
         bitField0_ = (bitField0_ & ~0x00000800);
-        replicationStrategy_ = akka.remote.protocol.RemoteProtocol.ReplicationStrategyType.WRITE_THROUGH;
+        replicationStrategy_ = akka.cluster.protocol.RemoteProtocol.ReplicationStrategyType.WRITE_THROUGH;
         onChanged();
         return this;
       }
       
       // repeated .RemoteMessageProtocol messages = 13;
-      private java.util.List<akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol> messages_ =
+      private java.util.List<akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol> messages_ =
         java.util.Collections.emptyList();
       private void ensureMessagesIsMutable() {
         if (!((bitField0_ & 0x00001000) == 0x00001000)) {
-          messages_ = new java.util.ArrayList<akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol>(messages_);
+          messages_ = new java.util.ArrayList<akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol>(messages_);
           bitField0_ |= 0x00001000;
          }
       }
       
       private com.google.protobuf.RepeatedFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder> messagesBuilder_;
+          akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol, akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.Builder, akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder> messagesBuilder_;
       
-      public java.util.List<akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol> getMessagesList() {
+      public java.util.List<akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol> getMessagesList() {
         if (messagesBuilder_ == null) {
           return java.util.Collections.unmodifiableList(messages_);
         } else {
@@ -5011,7 +5011,7 @@ public final class RemoteProtocol {
           return messagesBuilder_.getCount();
         }
       }
-      public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol getMessages(int index) {
+      public akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol getMessages(int index) {
         if (messagesBuilder_ == null) {
           return messages_.get(index);
         } else {
@@ -5019,7 +5019,7 @@ public final class RemoteProtocol {
         }
       }
       public Builder setMessages(
-          int index, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol value) {
+          int index, akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol value) {
         if (messagesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5033,7 +5033,7 @@ public final class RemoteProtocol {
         return this;
       }
       public Builder setMessages(
-          int index, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder builderForValue) {
+          int index, akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.Builder builderForValue) {
         if (messagesBuilder_ == null) {
           ensureMessagesIsMutable();
           messages_.set(index, builderForValue.build());
@@ -5043,7 +5043,7 @@ public final class RemoteProtocol {
         }
         return this;
       }
-      public Builder addMessages(akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol value) {
+      public Builder addMessages(akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol value) {
         if (messagesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5057,7 +5057,7 @@ public final class RemoteProtocol {
         return this;
       }
       public Builder addMessages(
-          int index, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol value) {
+          int index, akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol value) {
         if (messagesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5071,7 +5071,7 @@ public final class RemoteProtocol {
         return this;
       }
       public Builder addMessages(
-          akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder builderForValue) {
+          akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.Builder builderForValue) {
         if (messagesBuilder_ == null) {
           ensureMessagesIsMutable();
           messages_.add(builderForValue.build());
@@ -5082,7 +5082,7 @@ public final class RemoteProtocol {
         return this;
       }
       public Builder addMessages(
-          int index, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder builderForValue) {
+          int index, akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.Builder builderForValue) {
         if (messagesBuilder_ == null) {
           ensureMessagesIsMutable();
           messages_.add(index, builderForValue.build());
@@ -5093,7 +5093,7 @@ public final class RemoteProtocol {
         return this;
       }
       public Builder addAllMessages(
-          java.lang.Iterable<? extends akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol> values) {
+          java.lang.Iterable<? extends akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol> values) {
         if (messagesBuilder_ == null) {
           ensureMessagesIsMutable();
           super.addAll(values, messages_);
@@ -5123,18 +5123,18 @@ public final class RemoteProtocol {
         }
         return this;
       }
-      public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder getMessagesBuilder(
+      public akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.Builder getMessagesBuilder(
           int index) {
         return getMessagesFieldBuilder().getBuilder(index);
       }
-      public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder getMessagesOrBuilder(
+      public akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder getMessagesOrBuilder(
           int index) {
         if (messagesBuilder_ == null) {
           return messages_.get(index);  } else {
           return messagesBuilder_.getMessageOrBuilder(index);
         }
       }
-      public java.util.List<? extends akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder> 
+      public java.util.List<? extends akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder> 
            getMessagesOrBuilderList() {
         if (messagesBuilder_ != null) {
           return messagesBuilder_.getMessageOrBuilderList();
@@ -5142,25 +5142,25 @@ public final class RemoteProtocol {
           return java.util.Collections.unmodifiableList(messages_);
         }
       }
-      public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder addMessagesBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.Builder addMessagesBuilder() {
         return getMessagesFieldBuilder().addBuilder(
-            akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance());
+            akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance());
       }
-      public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder addMessagesBuilder(
+      public akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.Builder addMessagesBuilder(
           int index) {
         return getMessagesFieldBuilder().addBuilder(
-            index, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance());
+            index, akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance());
       }
-      public java.util.List<akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder> 
+      public java.util.List<akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.Builder> 
            getMessagesBuilderList() {
         return getMessagesFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder> 
+          akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol, akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.Builder, akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder> 
           getMessagesFieldBuilder() {
         if (messagesBuilder_ == null) {
           messagesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder>(
+              akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol, akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.Builder, akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder>(
                   messages_,
                   ((bitField0_ & 0x00001000) == 0x00001000),
                   getParentForChildren(),
@@ -5186,8 +5186,8 @@ public final class RemoteProtocol {
     
     // required .SerializedActorRefProtocol actorRef = 1;
     boolean hasActorRef();
-    akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol getActorRef();
-    akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocolOrBuilder getActorRefOrBuilder();
+    akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol getActorRef();
+    akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocolOrBuilder getActorRefOrBuilder();
     
     // required string interfaceName = 2;
     boolean hasInterfaceName();
@@ -5213,25 +5213,25 @@ public final class RemoteProtocol {
     
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.protocol.RemoteProtocol.internal_static_SerializedTypedActorRefProtocol_descriptor;
+      return akka.cluster.protocol.RemoteProtocol.internal_static_SerializedTypedActorRefProtocol_descriptor;
     }
     
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.protocol.RemoteProtocol.internal_static_SerializedTypedActorRefProtocol_fieldAccessorTable;
+      return akka.cluster.protocol.RemoteProtocol.internal_static_SerializedTypedActorRefProtocol_fieldAccessorTable;
     }
     
     private int bitField0_;
     // required .SerializedActorRefProtocol actorRef = 1;
     public static final int ACTORREF_FIELD_NUMBER = 1;
-    private akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol actorRef_;
+    private akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol actorRef_;
     public boolean hasActorRef() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
-    public akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol getActorRef() {
+    public akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol getActorRef() {
       return actorRef_;
     }
-    public akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocolOrBuilder getActorRefOrBuilder() {
+    public akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocolOrBuilder getActorRefOrBuilder() {
       return actorRef_;
     }
     
@@ -5268,7 +5268,7 @@ public final class RemoteProtocol {
     }
     
     private void initFields() {
-      actorRef_ = akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance();
+      actorRef_ = akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance();
       interfaceName_ = "";
     }
     private byte memoizedIsInitialized = -1;
@@ -5330,41 +5330,41 @@ public final class RemoteProtocol {
       return super.writeReplace();
     }
     
-    public static akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol parseFrom(byte[] data)
+    public static akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol parseFrom(java.io.InputStream input)
+    public static akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol parseDelimitedFrom(java.io.InputStream input)
+    public static akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       Builder builder = newBuilder();
       if (builder.mergeDelimitedFrom(input)) {
@@ -5373,7 +5373,7 @@ public final class RemoteProtocol {
         return null;
       }
     }
-    public static akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol parseDelimitedFrom(
+    public static akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -5384,12 +5384,12 @@ public final class RemoteProtocol {
         return null;
       }
     }
-    public static akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -5399,7 +5399,7 @@ public final class RemoteProtocol {
     
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol prototype) {
+    public static Builder newBuilder(akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -5412,18 +5412,18 @@ public final class RemoteProtocol {
     }
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocolOrBuilder {
+       implements akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocolOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.protocol.RemoteProtocol.internal_static_SerializedTypedActorRefProtocol_descriptor;
+        return akka.cluster.protocol.RemoteProtocol.internal_static_SerializedTypedActorRefProtocol_descriptor;
       }
       
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.protocol.RemoteProtocol.internal_static_SerializedTypedActorRefProtocol_fieldAccessorTable;
+        return akka.cluster.protocol.RemoteProtocol.internal_static_SerializedTypedActorRefProtocol_fieldAccessorTable;
       }
       
-      // Construct using akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol.newBuilder()
+      // Construct using akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -5444,7 +5444,7 @@ public final class RemoteProtocol {
       public Builder clear() {
         super.clear();
         if (actorRefBuilder_ == null) {
-          actorRef_ = akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance();
+          actorRef_ = akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance();
         } else {
           actorRefBuilder_.clear();
         }
@@ -5460,24 +5460,24 @@ public final class RemoteProtocol {
       
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol.getDescriptor();
+        return akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol.getDescriptor();
       }
       
-      public akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol getDefaultInstanceForType() {
-        return akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol.getDefaultInstance();
+      public akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol getDefaultInstanceForType() {
+        return akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol.getDefaultInstance();
       }
       
-      public akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol build() {
-        akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol result = buildPartial();
+      public akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol build() {
+        akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
       
-      private akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol buildParsed()
+      private akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol result = buildPartial();
+        akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
@@ -5485,8 +5485,8 @@ public final class RemoteProtocol {
         return result;
       }
       
-      public akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol buildPartial() {
-        akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol result = new akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol(this);
+      public akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol buildPartial() {
+        akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol result = new akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -5507,16 +5507,16 @@ public final class RemoteProtocol {
       }
       
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol) {
-          return mergeFrom((akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol)other);
+        if (other instanceof akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol) {
+          return mergeFrom((akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
       
-      public Builder mergeFrom(akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol other) {
-        if (other == akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol.getDefaultInstance()) return this;
+      public Builder mergeFrom(akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol other) {
+        if (other == akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol.getDefaultInstance()) return this;
         if (other.hasActorRef()) {
           mergeActorRef(other.getActorRef());
         }
@@ -5567,7 +5567,7 @@ public final class RemoteProtocol {
               break;
             }
             case 10: {
-              akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.Builder subBuilder = akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.newBuilder();
+              akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol.Builder subBuilder = akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol.newBuilder();
               if (hasActorRef()) {
                 subBuilder.mergeFrom(getActorRef());
               }
@@ -5587,20 +5587,20 @@ public final class RemoteProtocol {
       private int bitField0_;
       
       // required .SerializedActorRefProtocol actorRef = 1;
-      private akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol actorRef_ = akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance();
+      private akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol actorRef_ = akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol, akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.Builder, akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocolOrBuilder> actorRefBuilder_;
+          akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol, akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol.Builder, akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocolOrBuilder> actorRefBuilder_;
       public boolean hasActorRef() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
-      public akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol getActorRef() {
+      public akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol getActorRef() {
         if (actorRefBuilder_ == null) {
           return actorRef_;
         } else {
           return actorRefBuilder_.getMessage();
         }
       }
-      public Builder setActorRef(akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol value) {
+      public Builder setActorRef(akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol value) {
         if (actorRefBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5614,7 +5614,7 @@ public final class RemoteProtocol {
         return this;
       }
       public Builder setActorRef(
-          akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.Builder builderForValue) {
+          akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol.Builder builderForValue) {
         if (actorRefBuilder_ == null) {
           actorRef_ = builderForValue.build();
           onChanged();
@@ -5624,12 +5624,12 @@ public final class RemoteProtocol {
         bitField0_ |= 0x00000001;
         return this;
       }
-      public Builder mergeActorRef(akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol value) {
+      public Builder mergeActorRef(akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol value) {
         if (actorRefBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              actorRef_ != akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance()) {
+              actorRef_ != akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance()) {
             actorRef_ =
-              akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.newBuilder(actorRef_).mergeFrom(value).buildPartial();
+              akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol.newBuilder(actorRef_).mergeFrom(value).buildPartial();
           } else {
             actorRef_ = value;
           }
@@ -5642,7 +5642,7 @@ public final class RemoteProtocol {
       }
       public Builder clearActorRef() {
         if (actorRefBuilder_ == null) {
-          actorRef_ = akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance();
+          actorRef_ = akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance();
           onChanged();
         } else {
           actorRefBuilder_.clear();
@@ -5650,12 +5650,12 @@ public final class RemoteProtocol {
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
-      public akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.Builder getActorRefBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol.Builder getActorRefBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getActorRefFieldBuilder().getBuilder();
       }
-      public akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocolOrBuilder getActorRefOrBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocolOrBuilder getActorRefOrBuilder() {
         if (actorRefBuilder_ != null) {
           return actorRefBuilder_.getMessageOrBuilder();
         } else {
@@ -5663,11 +5663,11 @@ public final class RemoteProtocol {
         }
       }
       private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol, akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.Builder, akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocolOrBuilder> 
+          akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol, akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol.Builder, akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocolOrBuilder> 
           getActorRefFieldBuilder() {
         if (actorRefBuilder_ == null) {
           actorRefBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol, akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.Builder, akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocolOrBuilder>(
+              akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol, akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol.Builder, akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocolOrBuilder>(
                   actorRef_,
                   getParentForChildren(),
                   isClean());
@@ -5754,12 +5754,12 @@ public final class RemoteProtocol {
     
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.protocol.RemoteProtocol.internal_static_MessageProtocol_descriptor;
+      return akka.cluster.protocol.RemoteProtocol.internal_static_MessageProtocol_descriptor;
     }
     
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.protocol.RemoteProtocol.internal_static_MessageProtocol_fieldAccessorTable;
+      return akka.cluster.protocol.RemoteProtocol.internal_static_MessageProtocol_fieldAccessorTable;
     }
     
     private int bitField0_;
@@ -5838,41 +5838,41 @@ public final class RemoteProtocol {
       return super.writeReplace();
     }
     
-    public static akka.remote.protocol.RemoteProtocol.MessageProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.MessageProtocol parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.MessageProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.MessageProtocol parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.MessageProtocol parseFrom(byte[] data)
+    public static akka.cluster.protocol.RemoteProtocol.MessageProtocol parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.MessageProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.MessageProtocol parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.MessageProtocol parseFrom(java.io.InputStream input)
+    public static akka.cluster.protocol.RemoteProtocol.MessageProtocol parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.MessageProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.MessageProtocol parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.MessageProtocol parseDelimitedFrom(java.io.InputStream input)
+    public static akka.cluster.protocol.RemoteProtocol.MessageProtocol parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       Builder builder = newBuilder();
       if (builder.mergeDelimitedFrom(input)) {
@@ -5881,7 +5881,7 @@ public final class RemoteProtocol {
         return null;
       }
     }
-    public static akka.remote.protocol.RemoteProtocol.MessageProtocol parseDelimitedFrom(
+    public static akka.cluster.protocol.RemoteProtocol.MessageProtocol parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -5892,12 +5892,12 @@ public final class RemoteProtocol {
         return null;
       }
     }
-    public static akka.remote.protocol.RemoteProtocol.MessageProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.MessageProtocol parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.MessageProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.MessageProtocol parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -5907,7 +5907,7 @@ public final class RemoteProtocol {
     
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.protocol.RemoteProtocol.MessageProtocol prototype) {
+    public static Builder newBuilder(akka.cluster.protocol.RemoteProtocol.MessageProtocol prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -5920,18 +5920,18 @@ public final class RemoteProtocol {
     }
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.protocol.RemoteProtocol.MessageProtocolOrBuilder {
+       implements akka.cluster.protocol.RemoteProtocol.MessageProtocolOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.protocol.RemoteProtocol.internal_static_MessageProtocol_descriptor;
+        return akka.cluster.protocol.RemoteProtocol.internal_static_MessageProtocol_descriptor;
       }
       
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.protocol.RemoteProtocol.internal_static_MessageProtocol_fieldAccessorTable;
+        return akka.cluster.protocol.RemoteProtocol.internal_static_MessageProtocol_fieldAccessorTable;
       }
       
-      // Construct using akka.remote.protocol.RemoteProtocol.MessageProtocol.newBuilder()
+      // Construct using akka.cluster.protocol.RemoteProtocol.MessageProtocol.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -5963,24 +5963,24 @@ public final class RemoteProtocol {
       
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.protocol.RemoteProtocol.MessageProtocol.getDescriptor();
+        return akka.cluster.protocol.RemoteProtocol.MessageProtocol.getDescriptor();
       }
       
-      public akka.remote.protocol.RemoteProtocol.MessageProtocol getDefaultInstanceForType() {
-        return akka.remote.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance();
+      public akka.cluster.protocol.RemoteProtocol.MessageProtocol getDefaultInstanceForType() {
+        return akka.cluster.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance();
       }
       
-      public akka.remote.protocol.RemoteProtocol.MessageProtocol build() {
-        akka.remote.protocol.RemoteProtocol.MessageProtocol result = buildPartial();
+      public akka.cluster.protocol.RemoteProtocol.MessageProtocol build() {
+        akka.cluster.protocol.RemoteProtocol.MessageProtocol result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
       
-      private akka.remote.protocol.RemoteProtocol.MessageProtocol buildParsed()
+      private akka.cluster.protocol.RemoteProtocol.MessageProtocol buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.protocol.RemoteProtocol.MessageProtocol result = buildPartial();
+        akka.cluster.protocol.RemoteProtocol.MessageProtocol result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
@@ -5988,8 +5988,8 @@ public final class RemoteProtocol {
         return result;
       }
       
-      public akka.remote.protocol.RemoteProtocol.MessageProtocol buildPartial() {
-        akka.remote.protocol.RemoteProtocol.MessageProtocol result = new akka.remote.protocol.RemoteProtocol.MessageProtocol(this);
+      public akka.cluster.protocol.RemoteProtocol.MessageProtocol buildPartial() {
+        akka.cluster.protocol.RemoteProtocol.MessageProtocol result = new akka.cluster.protocol.RemoteProtocol.MessageProtocol(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -6006,16 +6006,16 @@ public final class RemoteProtocol {
       }
       
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.protocol.RemoteProtocol.MessageProtocol) {
-          return mergeFrom((akka.remote.protocol.RemoteProtocol.MessageProtocol)other);
+        if (other instanceof akka.cluster.protocol.RemoteProtocol.MessageProtocol) {
+          return mergeFrom((akka.cluster.protocol.RemoteProtocol.MessageProtocol)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
       
-      public Builder mergeFrom(akka.remote.protocol.RemoteProtocol.MessageProtocol other) {
-        if (other == akka.remote.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance()) return this;
+      public Builder mergeFrom(akka.cluster.protocol.RemoteProtocol.MessageProtocol other) {
+        if (other == akka.cluster.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance()) return this;
         if (other.hasMessage()) {
           setMessage(other.getMessage());
         }
@@ -6137,8 +6137,8 @@ public final class RemoteProtocol {
     
     // required .UuidProtocol uuid = 1;
     boolean hasUuid();
-    akka.remote.protocol.RemoteProtocol.UuidProtocol getUuid();
-    akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder();
+    akka.cluster.protocol.RemoteProtocol.UuidProtocol getUuid();
+    akka.cluster.protocol.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder();
     
     // required uint64 timeout = 2;
     boolean hasTimeout();
@@ -6168,25 +6168,25 @@ public final class RemoteProtocol {
     
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.protocol.RemoteProtocol.internal_static_ActorInfoProtocol_descriptor;
+      return akka.cluster.protocol.RemoteProtocol.internal_static_ActorInfoProtocol_descriptor;
     }
     
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.protocol.RemoteProtocol.internal_static_ActorInfoProtocol_fieldAccessorTable;
+      return akka.cluster.protocol.RemoteProtocol.internal_static_ActorInfoProtocol_fieldAccessorTable;
     }
     
     private int bitField0_;
     // required .UuidProtocol uuid = 1;
     public static final int UUID_FIELD_NUMBER = 1;
-    private akka.remote.protocol.RemoteProtocol.UuidProtocol uuid_;
+    private akka.cluster.protocol.RemoteProtocol.UuidProtocol uuid_;
     public boolean hasUuid() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
-    public akka.remote.protocol.RemoteProtocol.UuidProtocol getUuid() {
+    public akka.cluster.protocol.RemoteProtocol.UuidProtocol getUuid() {
       return uuid_;
     }
-    public akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder() {
+    public akka.cluster.protocol.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder() {
       return uuid_;
     }
     
@@ -6233,7 +6233,7 @@ public final class RemoteProtocol {
     }
     
     private void initFields() {
-      uuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+      uuid_ = akka.cluster.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
       timeout_ = 0L;
       address_ = "";
     }
@@ -6303,41 +6303,41 @@ public final class RemoteProtocol {
       return super.writeReplace();
     }
     
-    public static akka.remote.protocol.RemoteProtocol.ActorInfoProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.ActorInfoProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.ActorInfoProtocol parseFrom(byte[] data)
+    public static akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.ActorInfoProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.ActorInfoProtocol parseFrom(java.io.InputStream input)
+    public static akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.ActorInfoProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.ActorInfoProtocol parseDelimitedFrom(java.io.InputStream input)
+    public static akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       Builder builder = newBuilder();
       if (builder.mergeDelimitedFrom(input)) {
@@ -6346,7 +6346,7 @@ public final class RemoteProtocol {
         return null;
       }
     }
-    public static akka.remote.protocol.RemoteProtocol.ActorInfoProtocol parseDelimitedFrom(
+    public static akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -6357,12 +6357,12 @@ public final class RemoteProtocol {
         return null;
       }
     }
-    public static akka.remote.protocol.RemoteProtocol.ActorInfoProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.ActorInfoProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -6372,7 +6372,7 @@ public final class RemoteProtocol {
     
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.protocol.RemoteProtocol.ActorInfoProtocol prototype) {
+    public static Builder newBuilder(akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -6385,18 +6385,18 @@ public final class RemoteProtocol {
     }
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.protocol.RemoteProtocol.ActorInfoProtocolOrBuilder {
+       implements akka.cluster.protocol.RemoteProtocol.ActorInfoProtocolOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.protocol.RemoteProtocol.internal_static_ActorInfoProtocol_descriptor;
+        return akka.cluster.protocol.RemoteProtocol.internal_static_ActorInfoProtocol_descriptor;
       }
       
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.protocol.RemoteProtocol.internal_static_ActorInfoProtocol_fieldAccessorTable;
+        return akka.cluster.protocol.RemoteProtocol.internal_static_ActorInfoProtocol_fieldAccessorTable;
       }
       
-      // Construct using akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.newBuilder()
+      // Construct using akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -6417,7 +6417,7 @@ public final class RemoteProtocol {
       public Builder clear() {
         super.clear();
         if (uuidBuilder_ == null) {
-          uuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+          uuid_ = akka.cluster.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
         } else {
           uuidBuilder_.clear();
         }
@@ -6435,24 +6435,24 @@ public final class RemoteProtocol {
       
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.getDescriptor();
+        return akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol.getDescriptor();
       }
       
-      public akka.remote.protocol.RemoteProtocol.ActorInfoProtocol getDefaultInstanceForType() {
-        return akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.getDefaultInstance();
+      public akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol getDefaultInstanceForType() {
+        return akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol.getDefaultInstance();
       }
       
-      public akka.remote.protocol.RemoteProtocol.ActorInfoProtocol build() {
-        akka.remote.protocol.RemoteProtocol.ActorInfoProtocol result = buildPartial();
+      public akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol build() {
+        akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
       
-      private akka.remote.protocol.RemoteProtocol.ActorInfoProtocol buildParsed()
+      private akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.protocol.RemoteProtocol.ActorInfoProtocol result = buildPartial();
+        akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
@@ -6460,8 +6460,8 @@ public final class RemoteProtocol {
         return result;
       }
       
-      public akka.remote.protocol.RemoteProtocol.ActorInfoProtocol buildPartial() {
-        akka.remote.protocol.RemoteProtocol.ActorInfoProtocol result = new akka.remote.protocol.RemoteProtocol.ActorInfoProtocol(this);
+      public akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol buildPartial() {
+        akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol result = new akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -6486,16 +6486,16 @@ public final class RemoteProtocol {
       }
       
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.protocol.RemoteProtocol.ActorInfoProtocol) {
-          return mergeFrom((akka.remote.protocol.RemoteProtocol.ActorInfoProtocol)other);
+        if (other instanceof akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol) {
+          return mergeFrom((akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
       
-      public Builder mergeFrom(akka.remote.protocol.RemoteProtocol.ActorInfoProtocol other) {
-        if (other == akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.getDefaultInstance()) return this;
+      public Builder mergeFrom(akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol other) {
+        if (other == akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol.getDefaultInstance()) return this;
         if (other.hasUuid()) {
           mergeUuid(other.getUuid());
         }
@@ -6549,7 +6549,7 @@ public final class RemoteProtocol {
               break;
             }
             case 10: {
-              akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder subBuilder = akka.remote.protocol.RemoteProtocol.UuidProtocol.newBuilder();
+              akka.cluster.protocol.RemoteProtocol.UuidProtocol.Builder subBuilder = akka.cluster.protocol.RemoteProtocol.UuidProtocol.newBuilder();
               if (hasUuid()) {
                 subBuilder.mergeFrom(getUuid());
               }
@@ -6574,20 +6574,20 @@ public final class RemoteProtocol {
       private int bitField0_;
       
       // required .UuidProtocol uuid = 1;
-      private akka.remote.protocol.RemoteProtocol.UuidProtocol uuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+      private akka.cluster.protocol.RemoteProtocol.UuidProtocol uuid_ = akka.cluster.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.UuidProtocol, akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder, akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder> uuidBuilder_;
+          akka.cluster.protocol.RemoteProtocol.UuidProtocol, akka.cluster.protocol.RemoteProtocol.UuidProtocol.Builder, akka.cluster.protocol.RemoteProtocol.UuidProtocolOrBuilder> uuidBuilder_;
       public boolean hasUuid() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
-      public akka.remote.protocol.RemoteProtocol.UuidProtocol getUuid() {
+      public akka.cluster.protocol.RemoteProtocol.UuidProtocol getUuid() {
         if (uuidBuilder_ == null) {
           return uuid_;
         } else {
           return uuidBuilder_.getMessage();
         }
       }
-      public Builder setUuid(akka.remote.protocol.RemoteProtocol.UuidProtocol value) {
+      public Builder setUuid(akka.cluster.protocol.RemoteProtocol.UuidProtocol value) {
         if (uuidBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6601,7 +6601,7 @@ public final class RemoteProtocol {
         return this;
       }
       public Builder setUuid(
-          akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder builderForValue) {
+          akka.cluster.protocol.RemoteProtocol.UuidProtocol.Builder builderForValue) {
         if (uuidBuilder_ == null) {
           uuid_ = builderForValue.build();
           onChanged();
@@ -6611,12 +6611,12 @@ public final class RemoteProtocol {
         bitField0_ |= 0x00000001;
         return this;
       }
-      public Builder mergeUuid(akka.remote.protocol.RemoteProtocol.UuidProtocol value) {
+      public Builder mergeUuid(akka.cluster.protocol.RemoteProtocol.UuidProtocol value) {
         if (uuidBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              uuid_ != akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance()) {
+              uuid_ != akka.cluster.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance()) {
             uuid_ =
-              akka.remote.protocol.RemoteProtocol.UuidProtocol.newBuilder(uuid_).mergeFrom(value).buildPartial();
+              akka.cluster.protocol.RemoteProtocol.UuidProtocol.newBuilder(uuid_).mergeFrom(value).buildPartial();
           } else {
             uuid_ = value;
           }
@@ -6629,7 +6629,7 @@ public final class RemoteProtocol {
       }
       public Builder clearUuid() {
         if (uuidBuilder_ == null) {
-          uuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+          uuid_ = akka.cluster.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
           onChanged();
         } else {
           uuidBuilder_.clear();
@@ -6637,12 +6637,12 @@ public final class RemoteProtocol {
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
-      public akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder getUuidBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.UuidProtocol.Builder getUuidBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getUuidFieldBuilder().getBuilder();
       }
-      public akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder() {
+      public akka.cluster.protocol.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder() {
         if (uuidBuilder_ != null) {
           return uuidBuilder_.getMessageOrBuilder();
         } else {
@@ -6650,11 +6650,11 @@ public final class RemoteProtocol {
         }
       }
       private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.protocol.RemoteProtocol.UuidProtocol, akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder, akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder> 
+          akka.cluster.protocol.RemoteProtocol.UuidProtocol, akka.cluster.protocol.RemoteProtocol.UuidProtocol.Builder, akka.cluster.protocol.RemoteProtocol.UuidProtocolOrBuilder> 
           getUuidFieldBuilder() {
         if (uuidBuilder_ == null) {
           uuidBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.protocol.RemoteProtocol.UuidProtocol, akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder, akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder>(
+              akka.cluster.protocol.RemoteProtocol.UuidProtocol, akka.cluster.protocol.RemoteProtocol.UuidProtocol.Builder, akka.cluster.protocol.RemoteProtocol.UuidProtocolOrBuilder>(
                   uuid_,
                   getParentForChildren(),
                   isClean());
@@ -6762,12 +6762,12 @@ public final class RemoteProtocol {
     
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.protocol.RemoteProtocol.internal_static_UuidProtocol_descriptor;
+      return akka.cluster.protocol.RemoteProtocol.internal_static_UuidProtocol_descriptor;
     }
     
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.protocol.RemoteProtocol.internal_static_UuidProtocol_fieldAccessorTable;
+      return akka.cluster.protocol.RemoteProtocol.internal_static_UuidProtocol_fieldAccessorTable;
     }
     
     private int bitField0_;
@@ -6850,41 +6850,41 @@ public final class RemoteProtocol {
       return super.writeReplace();
     }
     
-    public static akka.remote.protocol.RemoteProtocol.UuidProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.UuidProtocol parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.UuidProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.UuidProtocol parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.UuidProtocol parseFrom(byte[] data)
+    public static akka.cluster.protocol.RemoteProtocol.UuidProtocol parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.UuidProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.UuidProtocol parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.UuidProtocol parseFrom(java.io.InputStream input)
+    public static akka.cluster.protocol.RemoteProtocol.UuidProtocol parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.UuidProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.UuidProtocol parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.UuidProtocol parseDelimitedFrom(java.io.InputStream input)
+    public static akka.cluster.protocol.RemoteProtocol.UuidProtocol parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       Builder builder = newBuilder();
       if (builder.mergeDelimitedFrom(input)) {
@@ -6893,7 +6893,7 @@ public final class RemoteProtocol {
         return null;
       }
     }
-    public static akka.remote.protocol.RemoteProtocol.UuidProtocol parseDelimitedFrom(
+    public static akka.cluster.protocol.RemoteProtocol.UuidProtocol parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -6904,12 +6904,12 @@ public final class RemoteProtocol {
         return null;
       }
     }
-    public static akka.remote.protocol.RemoteProtocol.UuidProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.UuidProtocol parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.UuidProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.UuidProtocol parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -6919,7 +6919,7 @@ public final class RemoteProtocol {
     
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.protocol.RemoteProtocol.UuidProtocol prototype) {
+    public static Builder newBuilder(akka.cluster.protocol.RemoteProtocol.UuidProtocol prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -6932,18 +6932,18 @@ public final class RemoteProtocol {
     }
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder {
+       implements akka.cluster.protocol.RemoteProtocol.UuidProtocolOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.protocol.RemoteProtocol.internal_static_UuidProtocol_descriptor;
+        return akka.cluster.protocol.RemoteProtocol.internal_static_UuidProtocol_descriptor;
       }
       
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.protocol.RemoteProtocol.internal_static_UuidProtocol_fieldAccessorTable;
+        return akka.cluster.protocol.RemoteProtocol.internal_static_UuidProtocol_fieldAccessorTable;
       }
       
-      // Construct using akka.remote.protocol.RemoteProtocol.UuidProtocol.newBuilder()
+      // Construct using akka.cluster.protocol.RemoteProtocol.UuidProtocol.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -6975,24 +6975,24 @@ public final class RemoteProtocol {
       
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.protocol.RemoteProtocol.UuidProtocol.getDescriptor();
+        return akka.cluster.protocol.RemoteProtocol.UuidProtocol.getDescriptor();
       }
       
-      public akka.remote.protocol.RemoteProtocol.UuidProtocol getDefaultInstanceForType() {
-        return akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+      public akka.cluster.protocol.RemoteProtocol.UuidProtocol getDefaultInstanceForType() {
+        return akka.cluster.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
       }
       
-      public akka.remote.protocol.RemoteProtocol.UuidProtocol build() {
-        akka.remote.protocol.RemoteProtocol.UuidProtocol result = buildPartial();
+      public akka.cluster.protocol.RemoteProtocol.UuidProtocol build() {
+        akka.cluster.protocol.RemoteProtocol.UuidProtocol result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
       
-      private akka.remote.protocol.RemoteProtocol.UuidProtocol buildParsed()
+      private akka.cluster.protocol.RemoteProtocol.UuidProtocol buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.protocol.RemoteProtocol.UuidProtocol result = buildPartial();
+        akka.cluster.protocol.RemoteProtocol.UuidProtocol result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
@@ -7000,8 +7000,8 @@ public final class RemoteProtocol {
         return result;
       }
       
-      public akka.remote.protocol.RemoteProtocol.UuidProtocol buildPartial() {
-        akka.remote.protocol.RemoteProtocol.UuidProtocol result = new akka.remote.protocol.RemoteProtocol.UuidProtocol(this);
+      public akka.cluster.protocol.RemoteProtocol.UuidProtocol buildPartial() {
+        akka.cluster.protocol.RemoteProtocol.UuidProtocol result = new akka.cluster.protocol.RemoteProtocol.UuidProtocol(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -7018,16 +7018,16 @@ public final class RemoteProtocol {
       }
       
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.protocol.RemoteProtocol.UuidProtocol) {
-          return mergeFrom((akka.remote.protocol.RemoteProtocol.UuidProtocol)other);
+        if (other instanceof akka.cluster.protocol.RemoteProtocol.UuidProtocol) {
+          return mergeFrom((akka.cluster.protocol.RemoteProtocol.UuidProtocol)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
       
-      public Builder mergeFrom(akka.remote.protocol.RemoteProtocol.UuidProtocol other) {
-        if (other == akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance()) return this;
+      public Builder mergeFrom(akka.cluster.protocol.RemoteProtocol.UuidProtocol other) {
+        if (other == akka.cluster.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance()) return this;
         if (other.hasHigh()) {
           setHigh(other.getHigh());
         }
@@ -7173,12 +7173,12 @@ public final class RemoteProtocol {
     
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.protocol.RemoteProtocol.internal_static_MetadataEntryProtocol_descriptor;
+      return akka.cluster.protocol.RemoteProtocol.internal_static_MetadataEntryProtocol_descriptor;
     }
     
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.protocol.RemoteProtocol.internal_static_MetadataEntryProtocol_fieldAccessorTable;
+      return akka.cluster.protocol.RemoteProtocol.internal_static_MetadataEntryProtocol_fieldAccessorTable;
     }
     
     private int bitField0_;
@@ -7283,41 +7283,41 @@ public final class RemoteProtocol {
       return super.writeReplace();
     }
     
-    public static akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol parseFrom(byte[] data)
+    public static akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol parseFrom(java.io.InputStream input)
+    public static akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol parseDelimitedFrom(java.io.InputStream input)
+    public static akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       Builder builder = newBuilder();
       if (builder.mergeDelimitedFrom(input)) {
@@ -7326,7 +7326,7 @@ public final class RemoteProtocol {
         return null;
       }
     }
-    public static akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol parseDelimitedFrom(
+    public static akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -7337,12 +7337,12 @@ public final class RemoteProtocol {
         return null;
       }
     }
-    public static akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -7352,7 +7352,7 @@ public final class RemoteProtocol {
     
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol prototype) {
+    public static Builder newBuilder(akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -7365,18 +7365,18 @@ public final class RemoteProtocol {
     }
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder {
+       implements akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.protocol.RemoteProtocol.internal_static_MetadataEntryProtocol_descriptor;
+        return akka.cluster.protocol.RemoteProtocol.internal_static_MetadataEntryProtocol_descriptor;
       }
       
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.protocol.RemoteProtocol.internal_static_MetadataEntryProtocol_fieldAccessorTable;
+        return akka.cluster.protocol.RemoteProtocol.internal_static_MetadataEntryProtocol_fieldAccessorTable;
       }
       
-      // Construct using akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.newBuilder()
+      // Construct using akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -7408,24 +7408,24 @@ public final class RemoteProtocol {
       
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.getDescriptor();
+        return akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol.getDescriptor();
       }
       
-      public akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol getDefaultInstanceForType() {
-        return akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.getDefaultInstance();
+      public akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol getDefaultInstanceForType() {
+        return akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol.getDefaultInstance();
       }
       
-      public akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol build() {
-        akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol result = buildPartial();
+      public akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol build() {
+        akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
       
-      private akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol buildParsed()
+      private akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol result = buildPartial();
+        akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
@@ -7433,8 +7433,8 @@ public final class RemoteProtocol {
         return result;
       }
       
-      public akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol buildPartial() {
-        akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol result = new akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol(this);
+      public akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol buildPartial() {
+        akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol result = new akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -7451,16 +7451,16 @@ public final class RemoteProtocol {
       }
       
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol) {
-          return mergeFrom((akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol)other);
+        if (other instanceof akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol) {
+          return mergeFrom((akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
       
-      public Builder mergeFrom(akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol other) {
-        if (other == akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.getDefaultInstance()) return this;
+      public Builder mergeFrom(akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol other) {
+        if (other == akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol.getDefaultInstance()) return this;
         if (other.hasKey()) {
           setKey(other.getKey());
         }
@@ -7598,7 +7598,7 @@ public final class RemoteProtocol {
     
     // required .LifeCycleType lifeCycle = 1;
     boolean hasLifeCycle();
-    akka.remote.protocol.RemoteProtocol.LifeCycleType getLifeCycle();
+    akka.cluster.protocol.RemoteProtocol.LifeCycleType getLifeCycle();
   }
   public static final class LifeCycleProtocol extends
       com.google.protobuf.GeneratedMessage
@@ -7620,27 +7620,27 @@ public final class RemoteProtocol {
     
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.protocol.RemoteProtocol.internal_static_LifeCycleProtocol_descriptor;
+      return akka.cluster.protocol.RemoteProtocol.internal_static_LifeCycleProtocol_descriptor;
     }
     
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.protocol.RemoteProtocol.internal_static_LifeCycleProtocol_fieldAccessorTable;
+      return akka.cluster.protocol.RemoteProtocol.internal_static_LifeCycleProtocol_fieldAccessorTable;
     }
     
     private int bitField0_;
     // required .LifeCycleType lifeCycle = 1;
     public static final int LIFECYCLE_FIELD_NUMBER = 1;
-    private akka.remote.protocol.RemoteProtocol.LifeCycleType lifeCycle_;
+    private akka.cluster.protocol.RemoteProtocol.LifeCycleType lifeCycle_;
     public boolean hasLifeCycle() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
-    public akka.remote.protocol.RemoteProtocol.LifeCycleType getLifeCycle() {
+    public akka.cluster.protocol.RemoteProtocol.LifeCycleType getLifeCycle() {
       return lifeCycle_;
     }
     
     private void initFields() {
-      lifeCycle_ = akka.remote.protocol.RemoteProtocol.LifeCycleType.PERMANENT;
+      lifeCycle_ = akka.cluster.protocol.RemoteProtocol.LifeCycleType.PERMANENT;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -7686,41 +7686,41 @@ public final class RemoteProtocol {
       return super.writeReplace();
     }
     
-    public static akka.remote.protocol.RemoteProtocol.LifeCycleProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.LifeCycleProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.LifeCycleProtocol parseFrom(byte[] data)
+    public static akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.LifeCycleProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.LifeCycleProtocol parseFrom(java.io.InputStream input)
+    public static akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.LifeCycleProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.LifeCycleProtocol parseDelimitedFrom(java.io.InputStream input)
+    public static akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       Builder builder = newBuilder();
       if (builder.mergeDelimitedFrom(input)) {
@@ -7729,7 +7729,7 @@ public final class RemoteProtocol {
         return null;
       }
     }
-    public static akka.remote.protocol.RemoteProtocol.LifeCycleProtocol parseDelimitedFrom(
+    public static akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -7740,12 +7740,12 @@ public final class RemoteProtocol {
         return null;
       }
     }
-    public static akka.remote.protocol.RemoteProtocol.LifeCycleProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.LifeCycleProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -7755,7 +7755,7 @@ public final class RemoteProtocol {
     
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.protocol.RemoteProtocol.LifeCycleProtocol prototype) {
+    public static Builder newBuilder(akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -7768,18 +7768,18 @@ public final class RemoteProtocol {
     }
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.protocol.RemoteProtocol.LifeCycleProtocolOrBuilder {
+       implements akka.cluster.protocol.RemoteProtocol.LifeCycleProtocolOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.protocol.RemoteProtocol.internal_static_LifeCycleProtocol_descriptor;
+        return akka.cluster.protocol.RemoteProtocol.internal_static_LifeCycleProtocol_descriptor;
       }
       
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.protocol.RemoteProtocol.internal_static_LifeCycleProtocol_fieldAccessorTable;
+        return akka.cluster.protocol.RemoteProtocol.internal_static_LifeCycleProtocol_fieldAccessorTable;
       }
       
-      // Construct using akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.newBuilder()
+      // Construct using akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -7798,7 +7798,7 @@ public final class RemoteProtocol {
       
       public Builder clear() {
         super.clear();
-        lifeCycle_ = akka.remote.protocol.RemoteProtocol.LifeCycleType.PERMANENT;
+        lifeCycle_ = akka.cluster.protocol.RemoteProtocol.LifeCycleType.PERMANENT;
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
@@ -7809,24 +7809,24 @@ public final class RemoteProtocol {
       
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.getDescriptor();
+        return akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol.getDescriptor();
       }
       
-      public akka.remote.protocol.RemoteProtocol.LifeCycleProtocol getDefaultInstanceForType() {
-        return akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.getDefaultInstance();
+      public akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol getDefaultInstanceForType() {
+        return akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol.getDefaultInstance();
       }
       
-      public akka.remote.protocol.RemoteProtocol.LifeCycleProtocol build() {
-        akka.remote.protocol.RemoteProtocol.LifeCycleProtocol result = buildPartial();
+      public akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol build() {
+        akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
       
-      private akka.remote.protocol.RemoteProtocol.LifeCycleProtocol buildParsed()
+      private akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.protocol.RemoteProtocol.LifeCycleProtocol result = buildPartial();
+        akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
@@ -7834,8 +7834,8 @@ public final class RemoteProtocol {
         return result;
       }
       
-      public akka.remote.protocol.RemoteProtocol.LifeCycleProtocol buildPartial() {
-        akka.remote.protocol.RemoteProtocol.LifeCycleProtocol result = new akka.remote.protocol.RemoteProtocol.LifeCycleProtocol(this);
+      public akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol buildPartial() {
+        akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol result = new akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -7848,16 +7848,16 @@ public final class RemoteProtocol {
       }
       
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.protocol.RemoteProtocol.LifeCycleProtocol) {
-          return mergeFrom((akka.remote.protocol.RemoteProtocol.LifeCycleProtocol)other);
+        if (other instanceof akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol) {
+          return mergeFrom((akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
       
-      public Builder mergeFrom(akka.remote.protocol.RemoteProtocol.LifeCycleProtocol other) {
-        if (other == akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.getDefaultInstance()) return this;
+      public Builder mergeFrom(akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol other) {
+        if (other == akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol.getDefaultInstance()) return this;
         if (other.hasLifeCycle()) {
           setLifeCycle(other.getLifeCycle());
         }
@@ -7898,7 +7898,7 @@ public final class RemoteProtocol {
             }
             case 8: {
               int rawValue = input.readEnum();
-              akka.remote.protocol.RemoteProtocol.LifeCycleType value = akka.remote.protocol.RemoteProtocol.LifeCycleType.valueOf(rawValue);
+              akka.cluster.protocol.RemoteProtocol.LifeCycleType value = akka.cluster.protocol.RemoteProtocol.LifeCycleType.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(1, rawValue);
               } else {
@@ -7914,14 +7914,14 @@ public final class RemoteProtocol {
       private int bitField0_;
       
       // required .LifeCycleType lifeCycle = 1;
-      private akka.remote.protocol.RemoteProtocol.LifeCycleType lifeCycle_ = akka.remote.protocol.RemoteProtocol.LifeCycleType.PERMANENT;
+      private akka.cluster.protocol.RemoteProtocol.LifeCycleType lifeCycle_ = akka.cluster.protocol.RemoteProtocol.LifeCycleType.PERMANENT;
       public boolean hasLifeCycle() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
-      public akka.remote.protocol.RemoteProtocol.LifeCycleType getLifeCycle() {
+      public akka.cluster.protocol.RemoteProtocol.LifeCycleType getLifeCycle() {
         return lifeCycle_;
       }
-      public Builder setLifeCycle(akka.remote.protocol.RemoteProtocol.LifeCycleType value) {
+      public Builder setLifeCycle(akka.cluster.protocol.RemoteProtocol.LifeCycleType value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -7932,7 +7932,7 @@ public final class RemoteProtocol {
       }
       public Builder clearLifeCycle() {
         bitField0_ = (bitField0_ & ~0x00000001);
-        lifeCycle_ = akka.remote.protocol.RemoteProtocol.LifeCycleType.PERMANENT;
+        lifeCycle_ = akka.cluster.protocol.RemoteProtocol.LifeCycleType.PERMANENT;
         onChanged();
         return this;
       }
@@ -7979,12 +7979,12 @@ public final class RemoteProtocol {
     
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.protocol.RemoteProtocol.internal_static_AddressProtocol_descriptor;
+      return akka.cluster.protocol.RemoteProtocol.internal_static_AddressProtocol_descriptor;
     }
     
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.protocol.RemoteProtocol.internal_static_AddressProtocol_fieldAccessorTable;
+      return akka.cluster.protocol.RemoteProtocol.internal_static_AddressProtocol_fieldAccessorTable;
     }
     
     private int bitField0_;
@@ -8089,41 +8089,41 @@ public final class RemoteProtocol {
       return super.writeReplace();
     }
     
-    public static akka.remote.protocol.RemoteProtocol.AddressProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.AddressProtocol parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.AddressProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.AddressProtocol parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.AddressProtocol parseFrom(byte[] data)
+    public static akka.cluster.protocol.RemoteProtocol.AddressProtocol parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.AddressProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.AddressProtocol parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.AddressProtocol parseFrom(java.io.InputStream input)
+    public static akka.cluster.protocol.RemoteProtocol.AddressProtocol parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.AddressProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.AddressProtocol parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.AddressProtocol parseDelimitedFrom(java.io.InputStream input)
+    public static akka.cluster.protocol.RemoteProtocol.AddressProtocol parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       Builder builder = newBuilder();
       if (builder.mergeDelimitedFrom(input)) {
@@ -8132,7 +8132,7 @@ public final class RemoteProtocol {
         return null;
       }
     }
-    public static akka.remote.protocol.RemoteProtocol.AddressProtocol parseDelimitedFrom(
+    public static akka.cluster.protocol.RemoteProtocol.AddressProtocol parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -8143,12 +8143,12 @@ public final class RemoteProtocol {
         return null;
       }
     }
-    public static akka.remote.protocol.RemoteProtocol.AddressProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.AddressProtocol parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.AddressProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.AddressProtocol parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -8158,7 +8158,7 @@ public final class RemoteProtocol {
     
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.protocol.RemoteProtocol.AddressProtocol prototype) {
+    public static Builder newBuilder(akka.cluster.protocol.RemoteProtocol.AddressProtocol prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -8171,18 +8171,18 @@ public final class RemoteProtocol {
     }
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.protocol.RemoteProtocol.AddressProtocolOrBuilder {
+       implements akka.cluster.protocol.RemoteProtocol.AddressProtocolOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.protocol.RemoteProtocol.internal_static_AddressProtocol_descriptor;
+        return akka.cluster.protocol.RemoteProtocol.internal_static_AddressProtocol_descriptor;
       }
       
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.protocol.RemoteProtocol.internal_static_AddressProtocol_fieldAccessorTable;
+        return akka.cluster.protocol.RemoteProtocol.internal_static_AddressProtocol_fieldAccessorTable;
       }
       
-      // Construct using akka.remote.protocol.RemoteProtocol.AddressProtocol.newBuilder()
+      // Construct using akka.cluster.protocol.RemoteProtocol.AddressProtocol.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -8214,24 +8214,24 @@ public final class RemoteProtocol {
       
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.protocol.RemoteProtocol.AddressProtocol.getDescriptor();
+        return akka.cluster.protocol.RemoteProtocol.AddressProtocol.getDescriptor();
       }
       
-      public akka.remote.protocol.RemoteProtocol.AddressProtocol getDefaultInstanceForType() {
-        return akka.remote.protocol.RemoteProtocol.AddressProtocol.getDefaultInstance();
+      public akka.cluster.protocol.RemoteProtocol.AddressProtocol getDefaultInstanceForType() {
+        return akka.cluster.protocol.RemoteProtocol.AddressProtocol.getDefaultInstance();
       }
       
-      public akka.remote.protocol.RemoteProtocol.AddressProtocol build() {
-        akka.remote.protocol.RemoteProtocol.AddressProtocol result = buildPartial();
+      public akka.cluster.protocol.RemoteProtocol.AddressProtocol build() {
+        akka.cluster.protocol.RemoteProtocol.AddressProtocol result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
       
-      private akka.remote.protocol.RemoteProtocol.AddressProtocol buildParsed()
+      private akka.cluster.protocol.RemoteProtocol.AddressProtocol buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.protocol.RemoteProtocol.AddressProtocol result = buildPartial();
+        akka.cluster.protocol.RemoteProtocol.AddressProtocol result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
@@ -8239,8 +8239,8 @@ public final class RemoteProtocol {
         return result;
       }
       
-      public akka.remote.protocol.RemoteProtocol.AddressProtocol buildPartial() {
-        akka.remote.protocol.RemoteProtocol.AddressProtocol result = new akka.remote.protocol.RemoteProtocol.AddressProtocol(this);
+      public akka.cluster.protocol.RemoteProtocol.AddressProtocol buildPartial() {
+        akka.cluster.protocol.RemoteProtocol.AddressProtocol result = new akka.cluster.protocol.RemoteProtocol.AddressProtocol(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -8257,16 +8257,16 @@ public final class RemoteProtocol {
       }
       
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.protocol.RemoteProtocol.AddressProtocol) {
-          return mergeFrom((akka.remote.protocol.RemoteProtocol.AddressProtocol)other);
+        if (other instanceof akka.cluster.protocol.RemoteProtocol.AddressProtocol) {
+          return mergeFrom((akka.cluster.protocol.RemoteProtocol.AddressProtocol)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
       
-      public Builder mergeFrom(akka.remote.protocol.RemoteProtocol.AddressProtocol other) {
-        if (other == akka.remote.protocol.RemoteProtocol.AddressProtocol.getDefaultInstance()) return this;
+      public Builder mergeFrom(akka.cluster.protocol.RemoteProtocol.AddressProtocol other) {
+        if (other == akka.cluster.protocol.RemoteProtocol.AddressProtocol.getDefaultInstance()) return this;
         if (other.hasHostname()) {
           setHostname(other.getHostname());
         }
@@ -8427,12 +8427,12 @@ public final class RemoteProtocol {
     
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.protocol.RemoteProtocol.internal_static_ExceptionProtocol_descriptor;
+      return akka.cluster.protocol.RemoteProtocol.internal_static_ExceptionProtocol_descriptor;
     }
     
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.protocol.RemoteProtocol.internal_static_ExceptionProtocol_fieldAccessorTable;
+      return akka.cluster.protocol.RemoteProtocol.internal_static_ExceptionProtocol_fieldAccessorTable;
     }
     
     private int bitField0_;
@@ -8559,41 +8559,41 @@ public final class RemoteProtocol {
       return super.writeReplace();
     }
     
-    public static akka.remote.protocol.RemoteProtocol.ExceptionProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.ExceptionProtocol parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.ExceptionProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.ExceptionProtocol parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.ExceptionProtocol parseFrom(byte[] data)
+    public static akka.cluster.protocol.RemoteProtocol.ExceptionProtocol parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.ExceptionProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.ExceptionProtocol parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.ExceptionProtocol parseFrom(java.io.InputStream input)
+    public static akka.cluster.protocol.RemoteProtocol.ExceptionProtocol parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.ExceptionProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.ExceptionProtocol parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.ExceptionProtocol parseDelimitedFrom(java.io.InputStream input)
+    public static akka.cluster.protocol.RemoteProtocol.ExceptionProtocol parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       Builder builder = newBuilder();
       if (builder.mergeDelimitedFrom(input)) {
@@ -8602,7 +8602,7 @@ public final class RemoteProtocol {
         return null;
       }
     }
-    public static akka.remote.protocol.RemoteProtocol.ExceptionProtocol parseDelimitedFrom(
+    public static akka.cluster.protocol.RemoteProtocol.ExceptionProtocol parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -8613,12 +8613,12 @@ public final class RemoteProtocol {
         return null;
       }
     }
-    public static akka.remote.protocol.RemoteProtocol.ExceptionProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.ExceptionProtocol parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.remote.protocol.RemoteProtocol.ExceptionProtocol parseFrom(
+    public static akka.cluster.protocol.RemoteProtocol.ExceptionProtocol parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -8628,7 +8628,7 @@ public final class RemoteProtocol {
     
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.protocol.RemoteProtocol.ExceptionProtocol prototype) {
+    public static Builder newBuilder(akka.cluster.protocol.RemoteProtocol.ExceptionProtocol prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -8641,18 +8641,18 @@ public final class RemoteProtocol {
     }
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.protocol.RemoteProtocol.ExceptionProtocolOrBuilder {
+       implements akka.cluster.protocol.RemoteProtocol.ExceptionProtocolOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.protocol.RemoteProtocol.internal_static_ExceptionProtocol_descriptor;
+        return akka.cluster.protocol.RemoteProtocol.internal_static_ExceptionProtocol_descriptor;
       }
       
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.protocol.RemoteProtocol.internal_static_ExceptionProtocol_fieldAccessorTable;
+        return akka.cluster.protocol.RemoteProtocol.internal_static_ExceptionProtocol_fieldAccessorTable;
       }
       
-      // Construct using akka.remote.protocol.RemoteProtocol.ExceptionProtocol.newBuilder()
+      // Construct using akka.cluster.protocol.RemoteProtocol.ExceptionProtocol.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -8684,24 +8684,24 @@ public final class RemoteProtocol {
       
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.protocol.RemoteProtocol.ExceptionProtocol.getDescriptor();
+        return akka.cluster.protocol.RemoteProtocol.ExceptionProtocol.getDescriptor();
       }
       
-      public akka.remote.protocol.RemoteProtocol.ExceptionProtocol getDefaultInstanceForType() {
-        return akka.remote.protocol.RemoteProtocol.ExceptionProtocol.getDefaultInstance();
+      public akka.cluster.protocol.RemoteProtocol.ExceptionProtocol getDefaultInstanceForType() {
+        return akka.cluster.protocol.RemoteProtocol.ExceptionProtocol.getDefaultInstance();
       }
       
-      public akka.remote.protocol.RemoteProtocol.ExceptionProtocol build() {
-        akka.remote.protocol.RemoteProtocol.ExceptionProtocol result = buildPartial();
+      public akka.cluster.protocol.RemoteProtocol.ExceptionProtocol build() {
+        akka.cluster.protocol.RemoteProtocol.ExceptionProtocol result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
       
-      private akka.remote.protocol.RemoteProtocol.ExceptionProtocol buildParsed()
+      private akka.cluster.protocol.RemoteProtocol.ExceptionProtocol buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.protocol.RemoteProtocol.ExceptionProtocol result = buildPartial();
+        akka.cluster.protocol.RemoteProtocol.ExceptionProtocol result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
@@ -8709,8 +8709,8 @@ public final class RemoteProtocol {
         return result;
       }
       
-      public akka.remote.protocol.RemoteProtocol.ExceptionProtocol buildPartial() {
-        akka.remote.protocol.RemoteProtocol.ExceptionProtocol result = new akka.remote.protocol.RemoteProtocol.ExceptionProtocol(this);
+      public akka.cluster.protocol.RemoteProtocol.ExceptionProtocol buildPartial() {
+        akka.cluster.protocol.RemoteProtocol.ExceptionProtocol result = new akka.cluster.protocol.RemoteProtocol.ExceptionProtocol(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -8727,16 +8727,16 @@ public final class RemoteProtocol {
       }
       
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.protocol.RemoteProtocol.ExceptionProtocol) {
-          return mergeFrom((akka.remote.protocol.RemoteProtocol.ExceptionProtocol)other);
+        if (other instanceof akka.cluster.protocol.RemoteProtocol.ExceptionProtocol) {
+          return mergeFrom((akka.cluster.protocol.RemoteProtocol.ExceptionProtocol)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
       
-      public Builder mergeFrom(akka.remote.protocol.RemoteProtocol.ExceptionProtocol other) {
-        if (other == akka.remote.protocol.RemoteProtocol.ExceptionProtocol.getDefaultInstance()) return this;
+      public Builder mergeFrom(akka.cluster.protocol.RemoteProtocol.ExceptionProtocol other) {
+        if (other == akka.cluster.protocol.RemoteProtocol.ExceptionProtocol.getDefaultInstance()) return this;
         if (other.hasClassname()) {
           setClassname(other.getClassname());
         }
@@ -9002,7 +9002,7 @@ public final class RemoteProtocol {
       "chemeType\022\010\n\004JAVA\020\001\022\013\n\007SBINARY\020\002\022\016\n\nSCAL" +
       "A_JSON\020\003\022\r\n\tJAVA_JSON\020\004\022\014\n\010PROTOBUF\020\005*-\n" +
       "\rLifeCycleType\022\r\n\tPERMANENT\020\001\022\r\n\tTEMPORA" +
-      "RY\020\002B\030\n\024akka.remote.protocolH\001"
+      "RY\020\002B\030\n\024akka.cluster.protocolH\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -9015,104 +9015,104 @@ public final class RemoteProtocol {
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_AkkaRemoteProtocol_descriptor,
               new java.lang.String[] { "Message", "Instruction", },
-              akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol.class,
-              akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol.Builder.class);
+              akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol.class,
+              akka.cluster.protocol.RemoteProtocol.AkkaRemoteProtocol.Builder.class);
           internal_static_RemoteMessageProtocol_descriptor =
             getDescriptor().getMessageTypes().get(1);
           internal_static_RemoteMessageProtocol_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_RemoteMessageProtocol_descriptor,
               new java.lang.String[] { "Uuid", "ActorInfo", "OneWay", "Message", "Exception", "SupervisorUuid", "Sender", "Metadata", },
-              akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.class,
-              akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder.class);
+              akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.class,
+              akka.cluster.protocol.RemoteProtocol.RemoteMessageProtocol.Builder.class);
           internal_static_RemoteControlProtocol_descriptor =
             getDescriptor().getMessageTypes().get(2);
           internal_static_RemoteControlProtocol_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_RemoteControlProtocol_descriptor,
               new java.lang.String[] { "Cookie", "CommandType", },
-              akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.class,
-              akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.Builder.class);
+              akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol.class,
+              akka.cluster.protocol.RemoteProtocol.RemoteControlProtocol.Builder.class);
           internal_static_RemoteActorRefProtocol_descriptor =
             getDescriptor().getMessageTypes().get(3);
           internal_static_RemoteActorRefProtocol_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_RemoteActorRefProtocol_descriptor,
               new java.lang.String[] { "Address", "InetSocketAddress", "Timeout", },
-              akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.class,
-              akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder.class);
+              akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.class,
+              akka.cluster.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder.class);
           internal_static_SerializedActorRefProtocol_descriptor =
             getDescriptor().getMessageTypes().get(4);
           internal_static_SerializedActorRefProtocol_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_SerializedActorRefProtocol_descriptor,
               new java.lang.String[] { "Uuid", "Address", "ActorClassname", "ActorInstance", "SerializerClassname", "Timeout", "ReceiveTimeout", "LifeCycle", "Supervisor", "HotswapStack", "ReplicationStorage", "ReplicationStrategy", "Messages", },
-              akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.class,
-              akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.Builder.class);
+              akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol.class,
+              akka.cluster.protocol.RemoteProtocol.SerializedActorRefProtocol.Builder.class);
           internal_static_SerializedTypedActorRefProtocol_descriptor =
             getDescriptor().getMessageTypes().get(5);
           internal_static_SerializedTypedActorRefProtocol_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_SerializedTypedActorRefProtocol_descriptor,
               new java.lang.String[] { "ActorRef", "InterfaceName", },
-              akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol.class,
-              akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol.Builder.class);
+              akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol.class,
+              akka.cluster.protocol.RemoteProtocol.SerializedTypedActorRefProtocol.Builder.class);
           internal_static_MessageProtocol_descriptor =
             getDescriptor().getMessageTypes().get(6);
           internal_static_MessageProtocol_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_MessageProtocol_descriptor,
               new java.lang.String[] { "Message", "MessageManifest", },
-              akka.remote.protocol.RemoteProtocol.MessageProtocol.class,
-              akka.remote.protocol.RemoteProtocol.MessageProtocol.Builder.class);
+              akka.cluster.protocol.RemoteProtocol.MessageProtocol.class,
+              akka.cluster.protocol.RemoteProtocol.MessageProtocol.Builder.class);
           internal_static_ActorInfoProtocol_descriptor =
             getDescriptor().getMessageTypes().get(7);
           internal_static_ActorInfoProtocol_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_ActorInfoProtocol_descriptor,
               new java.lang.String[] { "Uuid", "Timeout", "Address", },
-              akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.class,
-              akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.Builder.class);
+              akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol.class,
+              akka.cluster.protocol.RemoteProtocol.ActorInfoProtocol.Builder.class);
           internal_static_UuidProtocol_descriptor =
             getDescriptor().getMessageTypes().get(8);
           internal_static_UuidProtocol_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_UuidProtocol_descriptor,
               new java.lang.String[] { "High", "Low", },
-              akka.remote.protocol.RemoteProtocol.UuidProtocol.class,
-              akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder.class);
+              akka.cluster.protocol.RemoteProtocol.UuidProtocol.class,
+              akka.cluster.protocol.RemoteProtocol.UuidProtocol.Builder.class);
           internal_static_MetadataEntryProtocol_descriptor =
             getDescriptor().getMessageTypes().get(9);
           internal_static_MetadataEntryProtocol_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_MetadataEntryProtocol_descriptor,
               new java.lang.String[] { "Key", "Value", },
-              akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.class,
-              akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.Builder.class);
+              akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol.class,
+              akka.cluster.protocol.RemoteProtocol.MetadataEntryProtocol.Builder.class);
           internal_static_LifeCycleProtocol_descriptor =
             getDescriptor().getMessageTypes().get(10);
           internal_static_LifeCycleProtocol_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_LifeCycleProtocol_descriptor,
               new java.lang.String[] { "LifeCycle", },
-              akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.class,
-              akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.Builder.class);
+              akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol.class,
+              akka.cluster.protocol.RemoteProtocol.LifeCycleProtocol.Builder.class);
           internal_static_AddressProtocol_descriptor =
             getDescriptor().getMessageTypes().get(11);
           internal_static_AddressProtocol_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_AddressProtocol_descriptor,
               new java.lang.String[] { "Hostname", "Port", },
-              akka.remote.protocol.RemoteProtocol.AddressProtocol.class,
-              akka.remote.protocol.RemoteProtocol.AddressProtocol.Builder.class);
+              akka.cluster.protocol.RemoteProtocol.AddressProtocol.class,
+              akka.cluster.protocol.RemoteProtocol.AddressProtocol.Builder.class);
           internal_static_ExceptionProtocol_descriptor =
             getDescriptor().getMessageTypes().get(12);
           internal_static_ExceptionProtocol_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_ExceptionProtocol_descriptor,
               new java.lang.String[] { "Classname", "Message", },
-              akka.remote.protocol.RemoteProtocol.ExceptionProtocol.class,
-              akka.remote.protocol.RemoteProtocol.ExceptionProtocol.Builder.class);
+              akka.cluster.protocol.RemoteProtocol.ExceptionProtocol.class,
+              akka.cluster.protocol.RemoteProtocol.ExceptionProtocol.Builder.class);
           return null;
         }
       };
diff --git a/akka-cluster/src/main/protocol/RemoteProtocol.proto b/akka-cluster/src/main/protocol/RemoteProtocol.proto
index 5850acdff4..f239e68386 100644
--- a/akka-cluster/src/main/protocol/RemoteProtocol.proto
+++ b/akka-cluster/src/main/protocol/RemoteProtocol.proto
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2011 Typesafe Inc. <http://www.typesafe.com>
  */
 
-option java_package = "akka.remote.protocol";
+option java_package = "akka.cluster.protocol";
 option optimize_for = SPEED;
 
 /******************************************
diff --git a/akka-cluster/src/main/scala/akka/remote/BootableRemoteActorService.scala b/akka-cluster/src/main/scala/akka/cluster/BootableRemoteActorService.scala
similarity index 98%
rename from akka-cluster/src/main/scala/akka/remote/BootableRemoteActorService.scala
rename to akka-cluster/src/main/scala/akka/cluster/BootableRemoteActorService.scala
index f214e12f52..8d72a5e40c 100644
--- a/akka-cluster/src/main/scala/akka/remote/BootableRemoteActorService.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/BootableRemoteActorService.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2011 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.remote
+package akka.cluster
 
 import akka.actor.{ Actor, BootableActorLoaderService }
 import akka.util.{ ReflectiveAccess, Bootable }
diff --git a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala
index 19b0326cc7..d313ed3d51 100644
--- a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala
@@ -30,7 +30,8 @@ import DeploymentConfig._
 
 import akka.event.EventHandler
 import akka.dispatch.{ Dispatchers, Future }
-import akka.remoteinterface._
+import akka.cluster._
+import akka.cluster._
 import akka.routing.RouterType
 
 import akka.config.{ Config, Supervision }
@@ -277,7 +278,7 @@ class DefaultClusterNode private[akka] (
 
   //  private val connectToAllNewlyArrivedMembershipNodesInClusterLock = new AtomicBoolean(false)
 
-  private[cluster] lazy val remoteClientLifeCycleListener = localActorOf(new Actor {
+  private[cluster] lazy val remoteClientLifeCycleHandler = localActorOf(new Actor {
     def receive = {
       case RemoteClientError(cause, client, address) ⇒ client.shutdownClientModule()
       case RemoteClientDisconnected(client, address) ⇒ client.shutdownClientModule()
@@ -296,10 +297,11 @@ class DefaultClusterNode private[akka] (
         :: Nil))
 
   lazy val remoteService: RemoteSupport = {
-    val remote = new akka.remote.netty.NettyRemoteSupport
+    val remote = new akka.cluster.netty.NettyRemoteSupport
     remote.start(hostname, port)
     remote.register(RemoteClusterDaemon.Address, remoteDaemon)
-    remote.addListener(remoteClientLifeCycleListener)
+    remote.addListener(FailureDetector.registry)
+    remote.addListener(remoteClientLifeCycleHandler)
     remote
   }
 
@@ -421,7 +423,8 @@ class DefaultClusterNode private[akka] (
 
       remoteService.shutdown() // shutdown server
 
-      remoteClientLifeCycleListener.stop()
+      FailureDetector.registry.stop()
+      remoteClientLifeCycleHandler.stop()
       remoteDaemon.stop()
 
       // for monitoring remote listener
@@ -1756,8 +1759,8 @@ class RemoteClusterDaemon(cluster: ClusterNode) extends Actor {
 
   def handleUse(message: ClusterProtocol.RemoteDaemonMessageProtocol) {
     def deserializeMessages(entriesAsBytes: Vector[Array[Byte]]): Vector[AnyRef] = {
-      import akka.remote.protocol.RemoteProtocol._
-      import akka.remote.MessageSerializer
+      import akka.cluster.protocol.RemoteProtocol._
+      import akka.cluster.MessageSerializer
 
       entriesAsBytes map { bytes ⇒
         val messageBytes =
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala
index 906ec66d0d..788342d373 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala
@@ -10,6 +10,7 @@ import ReflectiveAccess._
 import akka.dispatch.Future
 import akka.routing._
 import RouterType._
+import akka.cluster._
 
 import java.net.InetSocketAddress
 import java.util.concurrent.atomic.AtomicReference
@@ -45,6 +46,10 @@ object ClusterActorRef {
    * Finds the cluster actor reference that has a specific address.
    */
   def actorFor(address: String): Option[ActorRef] = Actor.registry.local.actorFor(Address.clusterActorRefPrefix + address)
+
+  private[cluster] def createRemoteActorRef(actorAddress: String, inetSocketAddress: InetSocketAddress) = {
+    RemoteActorRef(inetSocketAddress, actorAddress, Actor.TIMEOUT, None)
+  }
 }
 
 /**
@@ -53,12 +58,15 @@ object ClusterActorRef {
  *
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
-class ClusterActorRef private[akka] (inetSocketAddresses: Array[Tuple2[UUID, InetSocketAddress]],
-                                     _address: String,
-                                     _timeout: Long,
-                                     val router: Router)
+class ClusterActorRef private[akka] (
+  inetSocketAddresses: Array[Tuple2[UUID, InetSocketAddress]],
+  _address: String,
+  _timeout: Long,
+  val router: Router)
   extends UnsupportedActorRef {
 
+  import ClusterActorRef._
+
   ClusterModule.ensureEnabled()
 
   //  val address = Address.clusterActorRefPrefix + _address
@@ -92,10 +100,6 @@ class ClusterActorRef private[akka] (inetSocketAddresses: Array[Tuple2[UUID, Ine
     router.route[Any](message, timeout.duration.toMillis)(sender)
   }
 
-  private def createRemoteActorRef(actorAddress: String, inetSocketAddress: InetSocketAddress) = {
-    RemoteActorRef(inetSocketAddress, actorAddress, Actor.TIMEOUT, None)
-  }
-
   private[akka] def failOver(from: InetSocketAddress, to: InetSocketAddress): Unit = {
     connections.failOver(from, to)
   }
@@ -120,75 +124,78 @@ class ClusterActorRef private[akka] (inetSocketAddresses: Array[Tuple2[UUID, Ine
       }
     }
   }
-
-  class ClusterActorRefConnections() extends RouterConnections {
-
-    private val state = new AtomicReference[State]()
-
-    def this(connectionMap: Map[InetSocketAddress, ActorRef]) = {
-      this()
-      state.set(new State(Long.MinValue, connectionMap))
-    }
-
-    def version: Long = state.get().version
-
-    def versionedIterator = {
-      val s = state.get
-      (s.version, s.connections.values)
-    }
-
-    def size: Int = state.get().connections.size
-
-    def stopAll() {
-      state.get().connections.values foreach (_.stop()) // shut down all remote connections
-    }
-
-    @tailrec
-    final def failOver(from: InetSocketAddress, to: InetSocketAddress): Unit = {
-      EventHandler.debug(this, "ClusterActorRef [%s] failover from [%s] to [%s]".format(address, from, to))
-
-      val oldState = state.get
-      var change = false
-      val newMap = oldState.connections map {
-        case (`from`, actorRef) ⇒
-          change = true
-          //          actorRef.stop()
-          (to, createRemoteActorRef(actorRef.address, to))
-        case other ⇒ other
-      }
-
-      if (change) {
-        //there was a state change, so we are now going to update the state.
-        val newState = new State(oldState.version + 1, newMap)
-
-        //if we are not able to update, the state, we are going to try again.
-        if (!state.compareAndSet(oldState, newState)) failOver(from, to)
-      }
-    }
-
-    @tailrec
-    final def signalDeadActor(deadRef: ActorRef) = {
-      EventHandler.debug(this, "ClusterActorRef [%s] signalDeadActor [%s]".format(uuid, deadRef.uuid))
-
-      val oldState = state.get()
-
-      //remote the ref from the connections.
-      var newConnections = Map[InetSocketAddress, ActorRef]()
-      oldState.connections.keys.foreach(
-        address ⇒ {
-          val actorRef: ActorRef = oldState.connections.get(address).get
-          if (actorRef ne deadRef) newConnections = newConnections + ((address, actorRef))
-        })
-
-      if (newConnections.size != oldState.connections.size) {
-        //one or more occurrances of the actorRef were removed, so we need to update the state.
-        val newState = new State(oldState.version + 1, newConnections)
-
-        //if we are not able to update the state, we just try again.
-        if (!state.compareAndSet(oldState, newState)) signalDeadActor(deadRef)
-      }
-    }
-
-    case class State(val version: Long, val connections: Map[InetSocketAddress, ActorRef])
-  }
+}
+
+class ClusterActorRefConnections() extends RouterConnections {
+  import ClusterActorRef._
+
+  private val state = new AtomicReference[State]()
+
+  def this(connectionMap: Map[InetSocketAddress, ActorRef]) = {
+    this()
+    state.set(new State(Long.MinValue, connectionMap))
+  }
+
+  def version: Long = state.get().version
+
+  def connections: Map[InetSocketAddress, ActorRef] = state.get.connections
+
+  def versionedIterator = {
+    val s = state.get
+    (s.version, s.connections.values)
+  }
+
+  def size: Int = state.get().connections.size
+
+  def stopAll() {
+    state.get().connections.values foreach (_.stop()) // shut down all remote connections
+  }
+
+  @tailrec
+  final def failOver(from: InetSocketAddress, to: InetSocketAddress): Unit = {
+    EventHandler.debug(this, "ClusterActorRef failover from [%s] to [%s]".format(from, to))
+
+    val oldState = state.get
+    var change = false
+    val newMap = oldState.connections map {
+      case (`from`, actorRef) ⇒
+        change = true
+        //          actorRef.stop()
+        (to, createRemoteActorRef(actorRef.address, to))
+      case other ⇒ other
+    }
+
+    if (change) {
+      //there was a state change, so we are now going to update the state.
+      val newState = new State(oldState.version + 1, newMap)
+
+      //if we are not able to update, the state, we are going to try again.
+      if (!state.compareAndSet(oldState, newState)) failOver(from, to)
+    }
+  }
+
+  @tailrec
+  final def remove(deadRef: ActorRef) = {
+    EventHandler.debug(this, "ClusterActorRef remove [%s]".format(deadRef.uuid))
+
+    val oldState = state.get()
+
+    //remote the ref from the connections.
+    var newConnections = Map[InetSocketAddress, ActorRef]()
+    oldState.connections.keys.foreach(
+      address ⇒ {
+        val actorRef: ActorRef = oldState.connections.get(address).get
+        if (actorRef ne deadRef) newConnections = newConnections + ((address, actorRef))
+      })
+
+    if (newConnections.size != oldState.connections.size) {
+      //one or more occurrances of the actorRef were removed, so we need to update the state.
+      val newState = new State(oldState.version + 1, newConnections)
+
+      //if we are not able to update the state, we just try again.
+      if (!state.compareAndSet(oldState, newState)) remove(deadRef)
+    }
+  }
+
+  case class State(val version: Long, val connections: Map[InetSocketAddress, ActorRef])
 }
diff --git a/akka-cluster/src/main/scala/akka/remote/MessageSerializer.scala b/akka-cluster/src/main/scala/akka/cluster/MessageSerializer.scala
similarity index 94%
rename from akka-cluster/src/main/scala/akka/remote/MessageSerializer.scala
rename to akka-cluster/src/main/scala/akka/cluster/MessageSerializer.scala
index f54bd5da05..c0223c24de 100644
--- a/akka-cluster/src/main/scala/akka/remote/MessageSerializer.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/MessageSerializer.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2009-2011 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.remote
+package akka.cluster
 
-import akka.remote.protocol.RemoteProtocol._
+import akka.cluster.protocol.RemoteProtocol._
 import akka.serialization.Serialization
 
 import com.google.protobuf.ByteString
diff --git a/akka-cluster/src/main/scala/akka/remote/RemoteConfig.scala b/akka-cluster/src/main/scala/akka/cluster/RemoteConfig.scala
similarity index 99%
rename from akka-cluster/src/main/scala/akka/remote/RemoteConfig.scala
rename to akka-cluster/src/main/scala/akka/cluster/RemoteConfig.scala
index 35cc083bc2..34a77539b7 100644
--- a/akka-cluster/src/main/scala/akka/remote/RemoteConfig.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/RemoteConfig.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2011 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.remote
+package akka.cluster
 
 import akka.util.Duration
 import akka.config.Config._
diff --git a/akka-cluster/src/main/scala/akka/cluster/TransactionLog.scala b/akka-cluster/src/main/scala/akka/cluster/TransactionLog.scala
index 405f173e19..256d5e48ef 100644
--- a/akka-cluster/src/main/scala/akka/cluster/TransactionLog.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/TransactionLog.scala
@@ -17,7 +17,7 @@ import akka.actor._
 import DeploymentConfig.ReplicationScheme
 import akka.event.EventHandler
 import akka.dispatch.{ DefaultPromise, Promise, MessageInvocation }
-import akka.remote.MessageSerializer
+import akka.cluster.MessageSerializer
 import akka.cluster.zookeeper._
 import akka.serialization.ActorSerialization._
 import akka.serialization.Compression.LZF
diff --git a/akka-cluster/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala b/akka-cluster/src/main/scala/akka/cluster/netty/NettyRemoteSupport.scala
similarity index 90%
rename from akka-cluster/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
rename to akka-cluster/src/main/scala/akka/cluster/netty/NettyRemoteSupport.scala
index 6ab52b8432..ee8dfa20e9 100644
--- a/akka-cluster/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/netty/NettyRemoteSupport.scala
@@ -2,14 +2,14 @@
  * Copyright (C) 2009-2011 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.remote.netty
+package akka.cluster.netty
 
 import akka.dispatch.{ ActorPromise, DefaultPromise, Promise }
-import akka.remote.{ MessageSerializer, RemoteClientSettings, RemoteServerSettings }
-import akka.remote.protocol.RemoteProtocol._
+import akka.cluster.{ MessageSerializer, RemoteClientSettings, RemoteServerSettings }
+import akka.cluster.protocol.RemoteProtocol._
 import akka.serialization.RemoteActorSerialization
 import akka.serialization.RemoteActorSerialization._
-import akka.remoteinterface._
+import akka.cluster._
 import akka.actor.{
   PoisonPill,
   Actor,
@@ -80,7 +80,7 @@ trait NettyRemoteClientModule extends RemoteClientModule {
                               isOneWay: Boolean,
                               actorRef: ActorRef,
                               loader: Option[ClassLoader]): Option[Promise[T]] =
-    withClientFor(remoteAddress, loader) { client =>
+    withClientFor(remoteAddress, loader) { client ⇒
       client.send[T](message, senderOption, senderFuture, remoteAddress, timeout, isOneWay, actorRef)
     }
 
@@ -159,7 +159,7 @@ abstract class RemoteClient private[akka] (
   val module: NettyRemoteClientModule,
   val remoteAddress: InetSocketAddress) {
 
-  val useTransactionLog = config.getBool("akka.cluster.client.buffering.retry-message-send-on-failure", true)
+  val useTransactionLog = config.getBool("akka.cluster.client.buffering.retry-message-send-on-failure", false)
   val transactionLogCapacity = config.getInt("akka.cluster.client.buffering.capacity", -1)
 
   val name = this.getClass.getSimpleName + "@" +
@@ -172,9 +172,9 @@ abstract class RemoteClient private[akka] (
     else new LinkedBlockingQueue[(Boolean, Uuid, RemoteMessageProtocol)](transactionLogCapacity)
   }
 
-  private[remote] val runSwitch = new Switch()
+  private[cluster] val runSwitch = new Switch()
 
-  private[remote] def isRunning = runSwitch.isOn
+  private[cluster] def isRunning = runSwitch.isOn
 
   protected def notifyListeners(msg: ⇒ Any): Unit
 
@@ -207,10 +207,11 @@ abstract class RemoteClient private[akka] (
     remoteAddress: InetSocketAddress,
     timeout: Long,
     isOneWay: Boolean,
-    actorRef: ActorRef): Option[Promise[T]] =
-    send(createRemoteMessageProtocolBuilder(
-      Some(actorRef), Left(actorRef.uuid), actorRef.address, timeout, Right(message), isOneWay, senderOption).build,
-      senderFuture)
+    actorRef: ActorRef): Option[Promise[T]] = {
+    val messageProtocol = createRemoteMessageProtocolBuilder(
+      Some(actorRef), Left(actorRef.uuid), actorRef.address, timeout, Right(message), isOneWay, senderOption).build
+    send(messageProtocol, senderFuture)
+  }
 
   /**
    * Sends the message across the wire
@@ -222,25 +223,26 @@ abstract class RemoteClient private[akka] (
     if (isRunning) {
       EventHandler.debug(this, "Sending to connection [%s] message [\n%s]".format(remoteAddress, request))
 
+      // tell
       if (request.getOneWay) {
         try {
           val future = currentChannel.write(RemoteEncoder.encode(request))
           future.awaitUninterruptibly()
           if (!future.isCancelled && !future.isSuccess) {
             notifyListeners(RemoteClientWriteFailed(request, future.getCause, module, remoteAddress))
-            throw future.getCause
           }
         } catch {
-          case e: Throwable ⇒
-            // add the request to the tx log after a failing send
+          case e: Exception ⇒
             notifyListeners(RemoteClientError(e, module, remoteAddress))
-            if (useTransactionLog) {
-              if (!pendingRequests.offer((true, null, request)))
-                throw new RemoteClientMessageBufferException("Buffer limit [" + transactionLogCapacity + "] reached")
-            } else throw e
+
+            if (useTransactionLog && !pendingRequests.offer((true, null, request))) { // Add the request to the tx log after a failing send
+              pendingRequests.clear()
+              throw new RemoteClientMessageBufferException("Buffer limit [" + transactionLogCapacity + "] reached")
+            }
         }
         None
 
+        // ask
       } else {
         val futureResult =
           if (senderFuture.isDefined) senderFuture.get
@@ -250,9 +252,10 @@ abstract class RemoteClient private[akka] (
         futures.put(futureUuid, futureResult) // Add future prematurely, remove it if write fails
 
         def handleRequestReplyError(future: ChannelFuture) = {
-          if (useTransactionLog) {
-            if (!pendingRequests.offer((false, futureUuid, request))) // Add the request to the tx log after a failing send
-              throw new RemoteClientMessageBufferException("Buffer limit [" + transactionLogCapacity + "] reached")
+          if (useTransactionLog && !pendingRequests.offer((false, futureUuid, request))) { // Add the request to the tx log after a failing send
+            pendingRequests.clear()
+            throw new RemoteClientMessageBufferException("Buffer limit [" + transactionLogCapacity + "] reached")
+
           } else {
             val f = futures.remove(futureUuid) // Clean up future
             if (f ne null) f.completeWithException(future.getCause)
@@ -264,53 +267,57 @@ abstract class RemoteClient private[akka] (
           // try to send the original one
           future = currentChannel.write(RemoteEncoder.encode(request))
           future.awaitUninterruptibly()
-          if (future.isCancelled) futures.remove(futureUuid) // Clean up future
-          else if (!future.isSuccess) {
+
+          if (future.isCancelled || !future.isSuccess) {
             notifyListeners(RemoteClientWriteFailed(request, future.getCause, module, remoteAddress))
             handleRequestReplyError(future)
           }
+
         } catch {
           case e: Exception ⇒
             notifyListeners(RemoteClientWriteFailed(request, e, module, remoteAddress))
             handleRequestReplyError(future)
-            throw e
         }
         Some(futureResult)
       }
 
     } else {
-      val exception = new RemoteClientException("RemoteModule client is not running, make sure you have invoked 'RemoteClient.connect' before using it.", module, remoteAddress)
+      val exception = new RemoteClientException("RemoteModule client is not running, make sure you have invoked 'RemoteClient.connect()' before using it.", module, remoteAddress)
       notifyListeners(RemoteClientError(exception, module, remoteAddress))
       throw exception
     }
   }
 
-  private[remote] def sendPendingRequests() = pendingRequests synchronized {
+  private[cluster] def sendPendingRequests() = pendingRequests synchronized {
     // ensure only one thread at a time can flush the log
     val nrOfMessages = pendingRequests.size
     if (nrOfMessages > 0) EventHandler.info(this, "Resending [%s] previously failed messages after remote client reconnect" format nrOfMessages)
     var pendingRequest = pendingRequests.peek
+
     while (pendingRequest ne null) {
       val (isOneWay, futureUuid, message) = pendingRequest
+
       if (isOneWay) {
         // tell
         val future = currentChannel.write(RemoteEncoder.encode(message))
         future.awaitUninterruptibly()
-        if (!future.isCancelled && !future.isSuccess) {
+
+        if (future.isCancelled && !future.isSuccess) {
           notifyListeners(RemoteClientWriteFailed(message, future.getCause, module, remoteAddress))
-          throw future.getCause
         }
+
       } else {
-        // sendRequestReply
+        // ask
         val future = currentChannel.write(RemoteEncoder.encode(message))
         future.awaitUninterruptibly()
-        if (future.isCancelled) futures.remove(futureUuid) // Clean up future
-        else if (!future.isSuccess) {
+
+        if (future.isCancelled || !future.isSuccess) {
           val f = futures.remove(futureUuid) // Clean up future
           if (f ne null) f.completeWithException(future.getCause)
           notifyListeners(RemoteClientWriteFailed(message, future.getCause, module, remoteAddress))
         }
       }
+
       pendingRequests.remove(pendingRequest)
       pendingRequest = pendingRequests.peek // try to grab next message
     }
@@ -332,9 +339,9 @@ class ActiveRemoteClient private[akka] (
   @volatile
   private var bootstrap: ClientBootstrap = _
   @volatile
-  private[remote] var connection: ChannelFuture = _
+  private[cluster] var connection: ChannelFuture = _
   @volatile
-  private[remote] var openChannels: DefaultChannelGroup = _
+  private[cluster] var openChannels: DefaultChannelGroup = _
   @volatile
   private var timer: HashedWheelTimer = _
   @volatile
@@ -344,7 +351,40 @@ class ActiveRemoteClient private[akka] (
 
   def currentChannel = connection.getChannel
 
+  /**
+   * Connect to remote server.
+   */
   def connect(reconnectIfAlreadyConnected: Boolean = false): Boolean = {
+
+    def sendSecureCookie(connection: ChannelFuture) {
+      val handshake = RemoteControlProtocol.newBuilder.setCommandType(CommandType.CONNECT)
+      if (SECURE_COOKIE.nonEmpty) handshake.setCookie(SECURE_COOKIE.get)
+      connection.getChannel.write(RemoteEncoder.encode(handshake.build))
+    }
+
+    def closeChannel(connection: ChannelFuture) = {
+      val channel = connection.getChannel
+      openChannels.remove(channel)
+      channel.close
+    }
+
+    def attemptReconnect(): Boolean = {
+      EventHandler.debug(this, "Remote client reconnecting to [%s]".format(remoteAddress))
+
+      val connection = bootstrap.connect(remoteAddress)
+      openChannels.add(connection.awaitUninterruptibly.getChannel) // Wait until the connection attempt succeeds or fails.
+
+      if (!connection.isSuccess) {
+        notifyListeners(RemoteClientError(connection.getCause, module, remoteAddress))
+        EventHandler.error(connection.getCause, this, "Reconnection to [%s] has failed".format(remoteAddress))
+        false
+
+      } else {
+        sendSecureCookie(connection)
+        true
+      }
+    }
+
     runSwitch switchOn {
       openChannels = new DefaultDisposableChannelGroup(classOf[RemoteClient].getName)
       timer = new HashedWheelTimer
@@ -356,29 +396,18 @@ class ActiveRemoteClient private[akka] (
 
       EventHandler.debug(this, "Starting remote client connection to [%s]".format(remoteAddress))
 
-      // Wait until the connection attempt succeeds or fails.
+      connection = bootstrap.connect(remoteAddress)
 
-      try {
-        connection = bootstrap.connect(remoteAddress)
-      } catch {
-        case e: Exception ⇒
-          EventHandler.error(e, this, "Remote client failed to connect to [%s]".format(remoteAddress))
-          throw e
-      }
-
-      openChannels.add(connection.awaitUninterruptibly.getChannel)
+      val channel = connection.awaitUninterruptibly.getChannel
+      openChannels.add(channel)
 
       if (!connection.isSuccess) {
         notifyListeners(RemoteClientError(connection.getCause, module, remoteAddress))
         EventHandler.error(connection.getCause, this, "Remote client connection to [%s] has failed".format(remoteAddress))
         false
-      } else {
-        //Send cookie
-        val handshake = RemoteControlProtocol.newBuilder.setCommandType(CommandType.CONNECT)
-        if (SECURE_COOKIE.nonEmpty)
-          handshake.setCookie(SECURE_COOKIE.get)
 
-        connection.getChannel.write(RemoteEncoder.encode(handshake.build))
+      } else {
+        sendSecureCookie(connection)
 
         //Add a task that does GCing of expired Futures
         timer.newTimeout(new TimerTask() {
@@ -399,31 +428,16 @@ class ActiveRemoteClient private[akka] (
     } match {
       case true ⇒ true
       case false if reconnectIfAlreadyConnected ⇒
+        closeChannel(connection)
+
         EventHandler.debug(this, "Remote client reconnecting to [%s]".format(remoteAddress))
+        attemptReconnect()
 
-        openChannels.remove(connection.getChannel)
-        connection.getChannel.close
-        connection = bootstrap.connect(remoteAddress)
-        openChannels.add(connection.awaitUninterruptibly.getChannel) // Wait until the connection attempt succeeds or fails.
-        if (!connection.isSuccess) {
-          notifyListeners(RemoteClientError(connection.getCause, module, remoteAddress))
-          EventHandler.error(connection.getCause, this, "Reconnection to [%s] has failed".format(remoteAddress))
-
-          false
-        } else {
-          //Send cookie
-          val handshake = RemoteControlProtocol.newBuilder.setCommandType(CommandType.CONNECT)
-          if (SECURE_COOKIE.nonEmpty)
-            handshake.setCookie(SECURE_COOKIE.get)
-
-          connection.getChannel.write(RemoteEncoder.encode(handshake.build))
-          true
-        }
       case false ⇒ false
     }
   }
 
-  //Please note that this method does _not_ remove the ARC from the NettyRemoteClientModule's map of clients
+  // Please note that this method does _not_ remove the ARC from the NettyRemoteClientModule's map of clients
   def shutdown() = runSwitch switchOff {
     EventHandler.info(this, "Shutting down remote client [%s]".format(name))
 
@@ -511,8 +525,7 @@ 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]".format(reply))
-          EventHandler.debug(this, "Trying to map back to future: %s".format(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 ⇒
@@ -531,10 +544,9 @@ class ActiveRemoteClientHandler(
           throw new RemoteClientException("Unknown message received in remote client handler: " + other, client.module, client.remoteAddress)
       }
     } catch {
-      case e: Throwable ⇒
+      case e: Exception ⇒
         EventHandler.error(e, this, e.getMessage)
         client.notifyListeners(RemoteClientError(e, client.module, client.remoteAddress))
-        throw e
     }
   }
 
@@ -549,7 +561,7 @@ class ActiveRemoteClientHandler(
         }
       }, RemoteClientSettings.RECONNECT_DELAY.toMillis, TimeUnit.MILLISECONDS)
     } else spawn {
-      client.module.shutdownClientConnection(remoteAddress)
+      client.module.shutdownClientConnection(remoteAddress) // spawn in another thread
     }
   }
 
@@ -560,10 +572,9 @@ class ActiveRemoteClientHandler(
       EventHandler.debug(this, "Remote client connected to [%s]".format(ctx.getChannel.getRemoteAddress))
       client.resetReconnectionTimeWindow
     } catch {
-      case e: Throwable ⇒
+      case e: Exception ⇒
         EventHandler.error(e, this, e.getMessage)
         client.notifyListeners(RemoteClientError(e, client.module, client.remoteAddress))
-        throw e
     }
   }
 
@@ -573,20 +584,21 @@ class ActiveRemoteClientHandler(
   }
 
   override def exceptionCaught(ctx: ChannelHandlerContext, event: ExceptionEvent) = {
-    if (event.getCause ne null)
-      EventHandler.error(event.getCause, this, "Unexpected exception from downstream in remote client: %s".format(event))
-    else
-      EventHandler.error(this, "Unexpected exception from downstream in remote client: %s".format(event))
+    val cause = event.getCause
+    if (cause ne null) {
+      EventHandler.error(event.getCause, this, "Unexpected exception [%s] from downstream in remote client [%s]".format(event.getCause, event))
 
-    event.getCause match {
-      case e: ReadTimeoutException ⇒
-        spawn {
-          client.module.shutdownClientConnection(remoteAddress)
-        }
-      case e: Exception ⇒
-        client.notifyListeners(RemoteClientError(e, client.module, client.remoteAddress))
-        event.getChannel.close //FIXME Is this the correct behavior?
-    }
+      cause match {
+        case e: ReadTimeoutException ⇒
+          spawn {
+            client.module.shutdownClientConnection(remoteAddress) // spawn in another thread
+          }
+        case e: Exception ⇒
+          client.notifyListeners(RemoteClientError(e, client.module, client.remoteAddress))
+          event.getChannel.close //FIXME Is this the correct behavior?
+      }
+
+    } else EventHandler.error(this, "Unexpected exception from downstream in remote client [%s]".format(event))
   }
 
   private def parseException(reply: RemoteMessageProtocol, loader: Option[ClassLoader]): Throwable = {
@@ -872,7 +884,7 @@ class RemoteServerAuthenticationHandler(secureCookie: Option[String]) extends Si
                   "The remote client [" + ctx.getChannel.getRemoteAddress + "] secure cookie is not the same as remote server secure cookie")
             }
           case _ ⇒
-            throw new SecurityException("The remote client [" + ctx.getChannel.getRemoteAddress + "] is not Authorized!")
+            throw new SecurityException("The remote client [" + ctx.getChannel.getRemoteAddress + "] is not authorized!")
         }
       }
   }
@@ -957,9 +969,12 @@ class RemoteServerHandler(
     event.getMessage match {
       case null ⇒
         throw new IllegalActorStateException("Message in remote MessageEvent is null: " + event)
+
       case remote: AkkaRemoteProtocol if remote.hasMessage ⇒
         handleRemoteMessageProtocol(remote.getMessage, event.getChannel)
+
       //case remote: AkkaRemoteProtocol if remote.hasInstruction => RemoteServer cannot receive control messages (yet)
+
       case _ ⇒ //ignore
     }
   }
@@ -1065,8 +1080,8 @@ class RemoteServerHandler(
 
     val actorRef = Actor.createActor(address, () ⇒ createSessionActor(actorInfo, channel))
 
-    if (actorRef eq null) throw new IllegalActorStateException(
-      "Could not find a remote actor with address [" + address + "] or uuid [" + uuid + "]")
+    if (actorRef eq null) throw new IllegalActorStateException("Could not find a remote actor with address [" + address + "] or uuid [" + uuid + "]")
+
     actorRef
   }
 
diff --git a/akka-cluster/src/main/scala/akka/serialization/SerializationProtocol.scala b/akka-cluster/src/main/scala/akka/serialization/SerializationProtocol.scala
index 810f813efb..da0699905b 100644
--- a/akka-cluster/src/main/scala/akka/serialization/SerializationProtocol.scala
+++ b/akka-cluster/src/main/scala/akka/serialization/SerializationProtocol.scala
@@ -10,8 +10,8 @@ import akka.actor._
 import DeploymentConfig._
 import akka.dispatch.MessageInvocation
 import akka.util.ReflectiveAccess
-import akka.remote.{ RemoteClientSettings, MessageSerializer }
-import akka.remote.protocol.RemoteProtocol
+import akka.cluster.{ RemoteClientSettings, MessageSerializer }
+import akka.cluster.protocol.RemoteProtocol
 import RemoteProtocol._
 
 import scala.collection.immutable.Stack
diff --git a/akka-docs/java/remote-actors.rst b/akka-docs/java/remote-actors.rst
index d08e72b0b9..311bc78803 100644
--- a/akka-docs/java/remote-actors.rst
+++ b/akka-docs/java/remote-actors.rst
@@ -503,7 +503,7 @@ So a simple listener actor can look like this:
 .. code-block:: java
 
   import akka.actor.UntypedActor;
-  import akka.remoteinterface.*;
+  import akka.cluster.*;
   
   class Listener extends UntypedActor {
 
@@ -561,7 +561,7 @@ So a simple listener actor can look like this:
 .. code-block:: java
 
   import akka.actor.UntypedActor;
-  import akka.remoteinterface.*;
+  import akka.cluster.*;
 
   class Listener extends UntypedActor {
 
diff --git a/akka-docs/scala/http.rst b/akka-docs/scala/http.rst
index 1cf0b930ae..984dc2737d 100644
--- a/akka-docs/scala/http.rst
+++ b/akka-docs/scala/http.rst
@@ -18,7 +18,7 @@ If you deploy Akka in a JEE container, don't forget to create an Akka initializa
 
   package com.my //<--- your own package
   import akka.util.AkkaLoader
-  import akka.remote.BootableRemoteActorService
+  import akka.cluster.BootableRemoteActorService
   import akka.actor.BootableActorLoaderService
   import javax.servlet.{ServletContextListener, ServletContextEvent}
 
@@ -63,7 +63,7 @@ If you want to use akka-camel or any other modules that have their own "Bootable
 .. code-block:: scala
 
   package com.my //<--- your own package
-  import akka.remote.BootableRemoteActorService
+  import akka.cluster.BootableRemoteActorService
   import akka.actor.BootableActorLoaderService
   import akka.camel.CamelService
   import javax.servlet.{ServletContextListener, ServletContextEvent}
diff --git a/akka-docs/scala/remote-actors.rst b/akka-docs/scala/remote-actors.rst
index 7fcfe34c01..5b1385e037 100644
--- a/akka-docs/scala/remote-actors.rst
+++ b/akka-docs/scala/remote-actors.rst
@@ -580,7 +580,7 @@ So a simple listener actor can look like this:
 
   import akka.actor.Actor
   import akka.actor.Actor._
-  import akka.remoteinterface._
+  import akka.cluster._
 
   val listener = actorOf(new Actor {
     def receive = {
@@ -638,7 +638,7 @@ So a simple listener actor can look like this:
 
   import akka.actor.Actor
   import akka.actor.Actor._
-  import akka.remoteinterface._
+  import akka.cluster._
 
   val listener = actorOf(new Actor {
     def receive = {
diff --git a/akka-durable-mailboxes/akka-mailboxes-common/src/main/scala/akka/actor/mailbox/DurableMailbox.scala b/akka-durable-mailboxes/akka-mailboxes-common/src/main/scala/akka/actor/mailbox/DurableMailbox.scala
index 381987e9f3..3748c47365 100644
--- a/akka-durable-mailboxes/akka-mailboxes-common/src/main/scala/akka/actor/mailbox/DurableMailbox.scala
+++ b/akka-durable-mailboxes/akka-mailboxes-common/src/main/scala/akka/actor/mailbox/DurableMailbox.scala
@@ -8,8 +8,8 @@ import MailboxProtocol._
 import akka.actor.{ Actor, ActorRef, NullChannel }
 import akka.dispatch._
 import akka.event.EventHandler
-import akka.remote.MessageSerializer
-import akka.remote.protocol.RemoteProtocol.MessageProtocol
+import akka.cluster.MessageSerializer
+import akka.cluster.protocol.RemoteProtocol.MessageProtocol
 import akka.AkkaException
 
 /**
diff --git a/akka-durable-mailboxes/akka-mongo-mailbox/src/main/scala/akka/actor/mailbox/BSONSerialization.scala b/akka-durable-mailboxes/akka-mongo-mailbox/src/main/scala/akka/actor/mailbox/BSONSerialization.scala
index 63808addd5..e99cf5283c 100644
--- a/akka-durable-mailboxes/akka-mongo-mailbox/src/main/scala/akka/actor/mailbox/BSONSerialization.scala
+++ b/akka-durable-mailboxes/akka-mongo-mailbox/src/main/scala/akka/actor/mailbox/BSONSerialization.scala
@@ -8,8 +8,8 @@ import akka.config.Config.config
 import akka.dispatch._
 import akka.event.EventHandler
 import akka.AkkaException
-import akka.remote.MessageSerializer
-import akka.remote.protocol.RemoteProtocol.MessageProtocol
+import akka.cluster.MessageSerializer
+import akka.cluster.protocol.RemoteProtocol.MessageProtocol
 
 import MailboxProtocol._
 
diff --git a/akka-kernel/src/main/scala/akka/kernel/DefaultAkkaLoader.scala b/akka-kernel/src/main/scala/akka/kernel/DefaultAkkaLoader.scala
index 8218c67efc..88645ceff8 100644
--- a/akka-kernel/src/main/scala/akka/kernel/DefaultAkkaLoader.scala
+++ b/akka-kernel/src/main/scala/akka/kernel/DefaultAkkaLoader.scala
@@ -6,7 +6,7 @@ package akka.http
 
 import akka.config.Config
 import akka.util.{ Bootable, AkkaLoader }
-import akka.remote.BootableRemoteActorService
+import akka.cluster.BootableRemoteActorService
 import akka.actor.BootableActorLoaderService
 
 class DefaultAkkaLoader extends AkkaLoader {
diff --git a/akka-kernel/src/main/scala/akka/kernel/Kernel.scala b/akka-kernel/src/main/scala/akka/kernel/Kernel.scala
index 4e3e5a6d74..b2710f5086 100644
--- a/akka-kernel/src/main/scala/akka/kernel/Kernel.scala
+++ b/akka-kernel/src/main/scala/akka/kernel/Kernel.scala
@@ -6,7 +6,7 @@ package akka.kernel
 
 import akka.http.EmbeddedAppServer
 import akka.util.AkkaLoader
-import akka.remote.BootableRemoteActorService
+import akka.cluster.BootableRemoteActorService
 import akka.actor.BootableActorLoaderService
 import akka.camel.CamelService
 
diff --git a/akka-kernel/src/main/scala/akka/servlet/Initializer.scala b/akka-kernel/src/main/scala/akka/servlet/Initializer.scala
index 41ca1ab932..5eeb74cce2 100644
--- a/akka-kernel/src/main/scala/akka/servlet/Initializer.scala
+++ b/akka-kernel/src/main/scala/akka/servlet/Initializer.scala
@@ -4,7 +4,7 @@
 
 package akka.servlet
 
-import akka.remote.BootableRemoteActorService
+import akka.cluster.BootableRemoteActorService
 import akka.actor.BootableActorLoaderService
 import akka.config.Config
 import akka.util.{ Bootable, AkkaLoader }
diff --git a/akka-samples/akka-sample-camel/src/test/scala/sample/camel/RemoteConsumerTest.scala b/akka-samples/akka-sample-camel/src/test/scala/sample/camel/RemoteConsumerTest.scala
index 98c8ed74d7..452a60153f 100644
--- a/akka-samples/akka-sample-camel/src/test/scala/sample/camel/RemoteConsumerTest.scala
+++ b/akka-samples/akka-sample-camel/src/test/scala/sample/camel/RemoteConsumerTest.scala
@@ -5,8 +5,8 @@ import org.scalatest.{ GivenWhenThen, BeforeAndAfterAll, FeatureSpec }
 import akka.actor.Actor._
 import akka.actor._
 import akka.camel._
-//import akka.remote.netty.NettyRemoteSupport
-//import akka.remoteinterface.RemoteServerModule
+//import akka.cluster.netty.NettyRemoteSupport
+//import akka.cluster.RemoteServerModule
 
 /**
  * @author Martin Krasser
diff --git a/akka-spring/src/test/resources/akka-test.conf b/akka-spring/src/test/resources/akka-test.conf
index a32dc0f338..f8992c3fa8 100644
--- a/akka-spring/src/test/resources/akka-test.conf
+++ b/akka-spring/src/test/resources/akka-test.conf
@@ -131,7 +131,7 @@ akka {
     compression-scheme = "zlib" # Options: "zlib" (lzf to come), leave out for no compression
     zlib-compression-level = 6  # Options: 0-9 (1 being fastest and 9 being the most compressed), default is 6
 
-    layer = "akka.remote.netty.NettyRemoteSupport"
+    layer = "akka.cluster.netty.NettyRemoteSupport"
 
     server {
       hostname = "localhost"       # The hostname or IP that clients should connect to
diff --git a/akka-spring/src/test/scala/TypedActorSpringFeatureTest.scala b/akka-spring/src/test/scala/TypedActorSpringFeatureTest.scala
index 0f1c0eaea0..460b72d0c4 100644
--- a/akka-spring/src/test/scala/TypedActorSpringFeatureTest.scala
+++ b/akka-spring/src/test/scala/TypedActorSpringFeatureTest.scala
@@ -15,7 +15,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext
 import org.springframework.core.io.{ ClassPathResource, Resource }
 import org.scalatest.{ BeforeAndAfterAll, FeatureSpec }
 import java.util.concurrent.CountDownLatch
-import akka.remote.netty.NettyRemoteSupport
+import akka.cluster.netty.NettyRemoteSupport
 import akka.actor._
 import akka.actor.Actor._
 
diff --git a/akka-spring/src/test/scala/UntypedActorSpringFeatureTest.scala b/akka-spring/src/test/scala/UntypedActorSpringFeatureTest.scala
index 8e32da1925..8dacdb6905 100644
--- a/akka-spring/src/test/scala/UntypedActorSpringFeatureTest.scala
+++ b/akka-spring/src/test/scala/UntypedActorSpringFeatureTest.scala
@@ -9,7 +9,7 @@ import org.scalatest.matchers.ShouldMatchers
 import org.scalatest.junit.JUnitRunner
 import org.junit.runner.RunWith
 import org.springframework.context.support.ClassPathXmlApplicationContext
-import akka.remote.netty.NettyRemoteSupport
+import akka.cluster.netty.NettyRemoteSupport
 import org.scalatest.{ BeforeAndAfterAll, FeatureSpec }
 
 import java.util.concurrent.CountDownLatch
diff --git a/config/akka-reference.conf b/config/akka-reference.conf
index 6cadc6f9d8..8aa31242f0 100644
--- a/config/akka-reference.conf
+++ b/config/akka-reference.conf
@@ -195,7 +195,7 @@ akka {
     zlib-compression-level = 6                    # Options: 0-9 (1 being fastest and 9 being the most compressed), default is 6
 
     # FIXME rename to transport
-    layer = "akka.remote.netty.NettyRemoteSupport"
+    layer = "akka.cluster.netty.NettyRemoteSupport"
 
     secure-cookie = ""                            # Generate your own with '$AKKA_HOME/scripts/generate_config_with_secure_cookie.sh'
                                                   #     or using 'akka.util.Crypt.generateSecureCookie'
@@ -226,9 +226,9 @@ akka {
 
     client {
       buffering {
-        retry-message-send-on-failure = on
-        capacity = -1                      # If negative (or zero) then an unbounded mailbox is used (default)
-                                           # If positive then a bounded mailbox is used and the capacity is set using the property
+        retry-message-send-on-failure = false # Should message buffering on remote client error be used (buffer flushed on successful reconnect)
+        capacity = -1                         # If negative (or zero) then an unbounded mailbox is used (default)
+                                              #     If positive then a bounded mailbox is used and the capacity is set using the property
       }
       reconnect-delay = 5
       read-timeout = 3600