diff --git a/akka-cluster/src/main/resources/reference.conf b/akka-cluster/src/main/resources/reference.conf
index 4ca09954fb..e38f31e33f 100644
--- a/akka-cluster/src/main/resources/reference.conf
+++ b/akka-cluster/src/main/resources/reference.conf
@@ -11,7 +11,7 @@ akka {
     # Initial contact points of the cluster.
     # The nodes to join automatically at startup.
     # Comma separated full URIs defined by a string on the form of
-    # "akka://system@hostname:port"
+    # "akka.tcp://system@hostname:port"
     # Leave as empty if the node is supposed to be joined manually.
     seed-nodes = []
 
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala
index cf958599ef..d0faa9ca38 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala
@@ -24,13 +24,13 @@ trait ClusterNodeMBean {
 
   /**
    * Comma separated addresses of member nodes, sorted in the cluster ring order.
-   * The address format is `akka://actor-system-name@hostname:port`
+   * The address format is `akka.tcp://actor-system-name@hostname:port`
    */
   def getMembers: String
 
   /**
    * Comma separated addresses of unreachable member nodes.
-   * The address format is `akka://actor-system-name@hostname:port`
+   * The address format is `akka.tcp://actor-system-name@hostname:port`
    */
   def getUnreachable: String
 
@@ -38,38 +38,38 @@ trait ClusterNodeMBean {
    * JSON format of the status of all nodes in the cluster as follows:
    * {{{
    * {
-   *   "self-address": "akka://system@host1:2552",
+   *   "self-address": "akka.tcp://system@host1:2552",
    *   "members": [
    *     {
-   *       "address": "akka://system@host1:2552",
+   *       "address": "akka.tcp://system@host1:2552",
    *       "status": "Up"
    *     },
    *     {
-   *       "address": "akka://system@host2:2552",
+   *       "address": "akka.tcp://system@host2:2552",
    *       "status": "Up"
    *     },
    *     {
-   *       "address": "akka://system@host3:2552",
+   *       "address": "akka.tcp://system@host3:2552",
    *       "status": "Down"
    *     },
    *     {
-   *       "address": "akka://system@host4:2552",
+   *       "address": "akka.tcp://system@host4:2552",
    *       "status": "Joining"
    *     }
    *   ],
    *   "unreachable": [
    *     {
-   *       "node": "akka://system@host2:2552",
+   *       "node": "akka.tcp://system@host2:2552",
    *       "observed-by": [
-   *         "akka://system@host1:2552",
-   *         "akka://system@host3:2552"
+   *         "akka.tcp://system@host1:2552",
+   *         "akka.tcp://system@host3:2552"
    *       ]
    *     },
    *     {
-   *       "node": "akka://system@host3:2552",
+   *       "node": "akka.tcp://system@host3:2552",
    *       "observed-by": [
-   *         "akka://system@host1:2552",
-   *         "akka://system@host2:2552"
+   *         "akka.tcp://system@host1:2552",
+   *         "akka.tcp://system@host2:2552"
    *       ]
    *     }
    *   ]
@@ -80,7 +80,7 @@ trait ClusterNodeMBean {
 
   /**
    * Get the address of the current leader.
-   * The address format is `akka://actor-system-name@hostname:port`
+   * The address format is `akka.tcp://actor-system-name@hostname:port`
    */
   def getLeader: String
 
@@ -97,20 +97,20 @@ trait ClusterNodeMBean {
 
   /**
    * Try to join this cluster node with the node specified by 'address'.
-   * The address format is `akka://actor-system-name@hostname:port`.
+   * The address format is `akka.tcp://actor-system-name@hostname:port`.
    * A 'Join(thisNodeAddress)' command is sent to the node to join.
    */
   def join(address: String)
 
   /**
    * Send command to issue state transition to LEAVING for the node specified by 'address'.
-   * The address format is `akka://actor-system-name@hostname:port`
+   * The address format is `akka.tcp://actor-system-name@hostname:port`
    */
   def leave(address: String)
 
   /**
    * Send command to DOWN the node specified by 'address'.
-   * The address format is `akka://actor-system-name@hostname:port`
+   * The address format is `akka.tcp://actor-system-name@hostname:port`
    */
   def down(address: String)
 }
diff --git a/akka-kernel/src/main/dist/bin/akka-cluster b/akka-kernel/src/main/dist/bin/akka-cluster
index 95eee59b35..7d05106f15 100755
--- a/akka-kernel/src/main/dist/bin/akka-cluster
+++ b/akka-kernel/src/main/dist/bin/akka-cluster
@@ -178,10 +178,10 @@ case "$1" in
         printf "%26s - %s\n" leader              "Asks the cluster who the current leader is"
         printf "%26s - %s\n" is-singleton        "Checks if the cluster is a singleton cluster (single node cluster)"
         printf "%26s - %s\n" is-available        "Checks if the member node is available"
-        printf "Where the <node-url> should be on the format of 'akka://actor-system-name@hostname:port'\n"
+        printf "Where the <node-url> should be on the format of 'akka.tcp://actor-system-name@hostname:port'\n"
         printf "\n"
         printf "Examples: bin/$SELF localhost 9999 is-available\n"
-        printf "          bin/$SELF localhost 9999 join akka://MySystem@darkstar:2552\n"
+        printf "          bin/$SELF localhost 9999 join akka.tcp://MySystem@darkstar:2552\n"
         printf "          bin/$SELF localhost 9999 cluster-status\n"
         exit 1
         ;;
diff --git a/akka-remote/src/main/resources/reference.conf b/akka-remote/src/main/resources/reference.conf
index 5a078fef86..ac9aae541a 100644
--- a/akka-remote/src/main/resources/reference.conf
+++ b/akka-remote/src/main/resources/reference.conf
@@ -33,14 +33,14 @@ akka {
       default {
 
         # if this is set to a valid remote address, the named actor will be
-        # deployed at that node e.g. "akka://sys@host:port"
+        # deployed at that node e.g. "akka.tcp://sys@host:port"
         remote = ""
 
         target {
 
           # A list of hostnames and ports for instantiating the children of a
           # router
-          #   The format should be on "akka://sys@host:port", where:
+          #   The format should be on "akka.tcp://sys@host:port", where:
           #    - sys is the remote actor system name
           #    - hostname can be either hostname or IP address the remote actor
           #      should connect to
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
index 0c39d187a7..2b4f3a53e7 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
@@ -230,11 +230,11 @@ private[akka] class RemoteActorRefProvider(
        *
        * Example:
        *
-       * akka://sys@home:1234/remote/akka/sys@remote:6667/remote/akka/sys@other:3333/user/a/b/c
+       * akka.tcp://sys@home:1234/remote/akka/sys@remote:6667/remote/akka/sys@other:3333/user/a/b/c
        *
-       * means that the logical parent originates from “akka://sys@other:3333” with
-       * one child (may be “a” or “b”) being deployed on “akka://sys@remote:6667” and
-       * finally either “b” or “c” being created on “akka://sys@home:1234”, where
+       * means that the logical parent originates from “akka.tcp://sys@other:3333” with
+       * one child (may be “a” or “b”) being deployed on “akka.tcp://sys@remote:6667” and
+       * finally either “b” or “c” being created on “akka.tcp://sys@home:1234”, where
        * this whole thing actually resides. Thus, the logical path is
        * “/user/a/b/c” and the physical path contains all remote placement
        * information.