diff --git a/akka-actors/src/main/scala/nio/RemoteServer.scala b/akka-actors/src/main/scala/nio/RemoteServer.scala
index 2ffe0e1f1a..5a542268c8 100755
--- a/akka-actors/src/main/scala/nio/RemoteServer.scala
+++ b/akka-actors/src/main/scala/nio/RemoteServer.scala
@@ -24,7 +24,7 @@ import org.jboss.netty.handler.codec.compression.{ZlibEncoder, ZlibDecoder}
  * Use this object if you need a single remote server on a specific node.
  *
  * <pre>
- * RemoteServerNode.start
+ * RemoteNode.start
  * </pre>
  *
  * If you need to create more than one, then you can use the RemoteServer:
@@ -36,7 +36,7 @@ import org.jboss.netty.handler.codec.compression.{ZlibEncoder, ZlibDecoder}
  *
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
-object RemoteServerNode extends RemoteServer
+object RemoteNode extends RemoteServer
 
 /**
  * This object holds configuration variables.
@@ -69,7 +69,7 @@ object RemoteServer {
  * If you need to create more than one, then you can use the RemoteServer:
  *
  * <pre>
- * RemoteServerNode.start
+ * RemoteNode.start
  * </pre>
  *
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
diff --git a/akka-actors/src/test/scala/RemoteActorTest.scala b/akka-actors/src/test/scala/RemoteActorTest.scala
index f0ab401eac..3e614bd42c 100644
--- a/akka-actors/src/test/scala/RemoteActorTest.scala
+++ b/akka-actors/src/test/scala/RemoteActorTest.scala
@@ -5,7 +5,8 @@ import junit.framework.TestCase
 
 import org.scalatest.junit.JUnitSuite
 import org.junit.Test
-import se.scalablesolutions.akka.nio.{RemoteServerNode, RemoteServer, RemoteClient}
+
+import se.scalablesolutions.akka.nio.{RemoteNode, RemoteServer, RemoteClient}
 
 object Global {
   var oneWay = "nada"  
@@ -32,7 +33,7 @@ class RemoteActorTest extends JUnitSuite   {
   akka.Config.config
   new Thread(new Runnable() {
      def run = {
-       RemoteServerNode.start
+       RemoteNode.start
      }
   }).start
   Thread.sleep(1000)
diff --git a/akka-actors/src/test/scala/RemoteSupervisorTest.scala b/akka-actors/src/test/scala/RemoteSupervisorTest.scala
index 42a8837db3..0fef2a2e6e 100644
--- a/akka-actors/src/test/scala/RemoteSupervisorTest.scala
+++ b/akka-actors/src/test/scala/RemoteSupervisorTest.scala
@@ -6,10 +6,10 @@ package se.scalablesolutions.akka.actor
 
 import se.scalablesolutions.akka.serialization.BinaryString
 import se.scalablesolutions.akka.config.ScalaConfig._
+import se.scalablesolutions.akka.nio.{RemoteNode, RemoteClient, RemoteServer}
 
 import org.scalatest.junit.JUnitSuite
 import org.junit.Test
-import se.scalablesolutions.akka.nio.{RemoteServerNode, RemoteClient, RemoteServer}
 
 object Log {
   var messageLog: String = ""
@@ -25,7 +25,7 @@ class RemoteSupervisorTest extends JUnitSuite {
   akka.Config.config
   new Thread(new Runnable() {
     def run = {
-      RemoteServerNode.start
+      RemoteNode.start
     }
   }).start
   Thread.sleep(1000)
diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java
index 3703efb43a..de2c1dbd41 100644
--- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java
+++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java
@@ -7,7 +7,7 @@ package se.scalablesolutions.akka.api;
 import se.scalablesolutions.akka.Config;
 import se.scalablesolutions.akka.actor.ActiveObject;
 import se.scalablesolutions.akka.config.ActiveObjectConfigurator;
-import se.scalablesolutions.akka.nio.RemoteServerNode;
+import se.scalablesolutions.akka.nio.RemoteNode;
 
 import junit.framework.TestCase;
 
@@ -17,7 +17,7 @@ public class RemoteInMemoryStateTest extends TestCase {
   static {
     new Thread(new Runnable() {
        public void run() {
-         RemoteServerNode.start();
+         RemoteNode.start();
        }
     }).start();
     try { Thread.currentThread().sleep(1000);  } catch (Exception e) {}
diff --git a/akka-kernel/src/main/scala/Kernel.scala b/akka-kernel/src/main/scala/Kernel.scala
index 295a1d3b38..8514198bc1 100644
--- a/akka-kernel/src/main/scala/Kernel.scala
+++ b/akka-kernel/src/main/scala/Kernel.scala
@@ -12,7 +12,7 @@ import javax.ws.rs.core.UriBuilder
 import java.io.File
 import java.net.URLClassLoader
 
-import se.scalablesolutions.akka.nio.RemoteServerNode
+import se.scalablesolutions.akka.nio.RemoteNode
 import se.scalablesolutions.akka.util.Logging
 
 /**
@@ -54,7 +54,7 @@ object Kernel extends Logging {
   def startRemoteService = {
     // FIXME manage remote serve thread for graceful shutdown
     val remoteServerThread = new Thread(new Runnable() {
-      def run = RemoteServerNode.start(applicationLoader)
+      def run = RemoteNode.start(applicationLoader)
     }, "Akka Remote Service")
     remoteServerThread.start
   }