diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala
index 43ea3586a9..a61ca3a6e1 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala
@@ -117,7 +117,7 @@ private[akka] class ClusterActorRef(props: RoutedProps, val address: String) ext
       if (_status == ActorRefInternals.RUNNING) {
         Actor.registry.local.unregisterClusterActorRef(this)
         _status = ActorRefInternals.SHUTDOWN
-        postMessageToMailbox(RemoteActorSystemMessage.Stop, None)
+        postMessageToMailbox(Terminate, None)
 
         // FIXME here we need to fire off Actor.cluster.remove(address) (which needs to be properly implemented first, see ticket)
         connections.stopAll()
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
index 87a65d21bf..0cc5efa591 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
@@ -273,7 +273,7 @@ private[akka] case class RemoteActorRef private[akka] (
     synchronized {
       if (running) {
         running = false
-        postMessageToMailbox(RemoteActorSystemMessage.Stop, None)
+        postMessageToMailbox(Terminate, None)
       }
     }
   }
diff --git a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
index 9c858d4701..519493704b 100644
--- a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
@@ -4,8 +4,7 @@
 
 package akka.remote.netty
 
-import akka.actor.{ ActorRef, Uuid, newUuid, uuidFrom, IllegalActorStateException, PoisonPill, RemoteActorSystemMessage, AutoReceivedMessage }
-import akka.dispatch.{ ActorPromise, DefaultPromise, Promise }
+import akka.actor.{ ActorRef, Uuid, newUuid, uuidFrom, IllegalActorStateException, PoisonPill, AutoReceivedMessage }
 import akka.remote._
 import RemoteProtocol._
 import akka.util._
@@ -28,6 +27,7 @@ import java.util.concurrent.atomic._
 import akka.AkkaException
 import akka.AkkaApplication
 import akka.serialization.RemoteActorSerialization
+import akka.dispatch.{ Terminate, ActorPromise, DefaultPromise, Promise }
 
 class RemoteClientMessageBufferException(message: String, cause: Throwable = null) extends AkkaException(message, cause) {
   def this(msg: String) = this(msg, null);
@@ -958,7 +958,7 @@ class RemoteServerHandler(
 
     message match {
       // first match on system messages
-      case RemoteActorSystemMessage.Stop ⇒
+      case Terminate ⇒
         if (UNTRUSTED_MODE) throw new SecurityException("RemoteModule server is operating is untrusted mode, can not stop the actor")
         else actorRef.stop()