diff --git a/akka-cluster-tools/src/main/resources/reference.conf b/akka-cluster-tools/src/main/resources/reference.conf
index 5116677c08..30e2c6a8b6 100644
--- a/akka-cluster-tools/src/main/resources/reference.conf
+++ b/akka-cluster-tools/src/main/resources/reference.conf
@@ -136,6 +136,9 @@ akka.cluster.singleton {
 }
 
 akka.cluster.singleton-proxy {
+  # The actor name of the singleton actor that is started by the ClusterSingletonManager
+  singleton-name = ${akka.cluster.singleton.singleton-name}
+  
   # The role of the cluster nodes where the singleton can be deployed. 
   # If the role is not specified then any node will do.
   role = ""
diff --git a/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala b/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala
index e1a4bddc9c..1ac63338b7 100644
--- a/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala
+++ b/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala
@@ -353,10 +353,7 @@ class ClusterSingletonManagerIsStuck(message: String) extends AkkaException(mess
  * but more than one active singletons is prevented by all reasonable means. Some
  * corner cases are eventually resolved by configurable timeouts.
  *
- * You access the singleton actor with `actorSelection` using the names you have
- * specified when creating the ClusterSingletonManager. You can subscribe to
- * [[akka.cluster.ClusterEvent.MemberEvent]] and sort the members by age
- * ([[akka.cluster.Member#isOlderThan]]) to keep track of oldest member.
+ * You access the singleton actor with [[ClusterSingletonProxy]].
  * Alternatively the singleton actor may broadcast its existence when it is started.
  *
  * Use factory method [[ClusterSingletonManager#props]] to create the
@@ -547,8 +544,8 @@ class ClusterSingletonManager(
   }
 
   def gotoOldest(): State = {
-    logInfo("Singleton manager [{}] starting singleton actor", cluster.selfAddress)
     val singleton = context watch context.actorOf(singletonProps, singletonName)
+    logInfo("Singleton manager starting singleton actor [{}]", singleton.path)
     goto(Oldest) using OldestData(singleton)
   }
 
diff --git a/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonProxy.scala b/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonProxy.scala
index 15fea1f68c..43b396e96b 100644
--- a/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonProxy.scala
+++ b/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonProxy.scala
@@ -17,6 +17,7 @@ import scala.concurrent.duration._
 import scala.language.postfixOps
 import com.typesafe.config.Config
 import akka.actor.NoSerializationVerificationNeeded
+import akka.event.Logging
 
 object ClusterSingletonProxySettings {
 
@@ -33,6 +34,7 @@ object ClusterSingletonProxySettings {
    */
   def apply(config: Config): ClusterSingletonProxySettings =
     new ClusterSingletonProxySettings(
+      singletonName = config.getString("singleton-name"),
       role = roleOption(config.getString("role")),
       singletonIdentificationInterval = config.getDuration("singleton-identification-interval", MILLISECONDS).millis,
       bufferSize = config.getInt("buffer-size"))
@@ -58,6 +60,7 @@ object ClusterSingletonProxySettings {
 }
 
 /**
+ * @param singletonName The actor name of the singleton actor that is started by the [[ClusterSingletonManager]].
  * @param role The role of the cluster nodes where the singleton can be deployed. If None, then any node will do.
  * @param singletonIdentificationInterval Interval at which the proxy will try to resolve the singleton instance.
  * @param bufferSize If the location of the singleton is unknown the proxy will buffer this number of messages
@@ -66,12 +69,15 @@ object ClusterSingletonProxySettings {
  *   immediately if the location of the singleton is unknown.
  */
 final class ClusterSingletonProxySettings(
+  val singletonName: String,
   val role: Option[String],
   val singletonIdentificationInterval: FiniteDuration,
   val bufferSize: Int) extends NoSerializationVerificationNeeded {
 
   require(bufferSize >= 0 && bufferSize <= 10000, "bufferSize must be >= 0 and <= 10000")
 
+  def withSingletonName(name: String): ClusterSingletonProxySettings = copy(singletonName = name)
+
   def withRole(role: String): ClusterSingletonProxySettings = copy(role = ClusterSingletonProxySettings.roleOption(role))
 
   def withRole(role: Option[String]): ClusterSingletonProxySettings = copy(role = role)
@@ -82,21 +88,23 @@ final class ClusterSingletonProxySettings(
   def withBufferSize(bufferSize: Int): ClusterSingletonProxySettings =
     copy(bufferSize = bufferSize)
 
-  private def copy(role: Option[String] = role,
+  private def copy(singletonName: String = singletonName,
+                   role: Option[String] = role,
                    singletonIdentificationInterval: FiniteDuration = singletonIdentificationInterval,
                    bufferSize: Int = bufferSize): ClusterSingletonProxySettings =
-    new ClusterSingletonProxySettings(role, singletonIdentificationInterval, bufferSize)
+    new ClusterSingletonProxySettings(singletonName, role, singletonIdentificationInterval, bufferSize)
 }
 
 object ClusterSingletonProxy {
   /**
    * Scala API: Factory method for `ClusterSingletonProxy` [[akka.actor.Props]].
    *
-   * @param singletonPath The logical path of the singleton, i.e., /user/singletonManager/singleton.
+   * @param singletonManagerPath The logical path of the singleton manager, e.g. `/user/singletonManager`,
+   *   which ends with the name you defined in `actorOf` when creating the [[ClusterSingletonManager]].
    * @param settings see [[ClusterSingletonProxySettings]]
    */
-  def props(singletonPath: String, settings: ClusterSingletonProxySettings): Props =
-    Props(new ClusterSingletonProxy(singletonPath, settings)).withDeploy(Deploy.local)
+  def props(singletonManagerPath: String, settings: ClusterSingletonProxySettings): Props =
+    Props(new ClusterSingletonProxy(singletonManagerPath, settings)).withDeploy(Deploy.local)
 
   private case object TryToIdentifySingleton
 
@@ -120,12 +128,12 @@ object ClusterSingletonProxy {
  * Note that this is a best effort implementation: messages can always be lost due to the distributed nature of the
  * actors involved.
  */
-final class ClusterSingletonProxy(singletonPathString: String, settings: ClusterSingletonProxySettings) extends Actor with ActorLogging {
+final class ClusterSingletonProxy(singletonManagerPath: String, settings: ClusterSingletonProxySettings) extends Actor with ActorLogging {
   import settings._
-  val singletonPath = singletonPathString.split("/")
+  val singletonPath = (singletonManagerPath + "/" + settings.singletonName).split("/")
   var identifyCounter = 0
   var identifyId = createIdentifyId(identifyCounter)
-  def createIdentifyId(i: Int) = "identify-singleton-" + singletonPath mkString "/" + i
+  def createIdentifyId(i: Int) = "identify-singleton-" + singletonPath.mkString("/") + i
   var identifyTimer: Option[Cancellable] = None
 
   val cluster = Cluster(context.system)
@@ -221,7 +229,7 @@ final class ClusterSingletonProxy(singletonPathString: String, settings: Cluster
     // singleton identification logic
     case ActorIdentity(identifyId, Some(s)) ⇒
       // if the new singleton is defined, deliver all buffered messages
-      log.info("Singleton identified: {}", s.path)
+      log.info("Singleton identified at [{}]", s.path)
       singleton = Some(s)
       context.watch(s)
       cancelTimer()
@@ -231,7 +239,7 @@ final class ClusterSingletonProxy(singletonPathString: String, settings: Cluster
       membersByAge.headOption.foreach {
         oldest ⇒
           val singletonAddress = RootActorPath(oldest.address) / singletonPath
-          log.debug("Trying to identify singleton at {}", singletonAddress)
+          log.debug("Trying to identify singleton at [{}]", singletonAddress)
           context.actorSelection(singletonAddress) ! Identify(identifyId)
       }
     case Terminated(ref) ⇒
@@ -244,7 +252,9 @@ final class ClusterSingletonProxy(singletonPathString: String, settings: Cluster
     case msg: Any ⇒
       singleton match {
         case Some(s) ⇒
-          log.debug("Forwarding message type [{}] to current singleton instance", msg.getClass.getName)
+          if (log.isDebugEnabled)
+            log.debug("Forwarding message of type [{}] to current singleton instance at [{}]: {}",
+              Logging.simpleName(msg.getClass.getName), s.path)
           s forward msg
         case None ⇒
           buffer(msg)
diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerChaosSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerChaosSpec.scala
index 0c166b9ea3..e390c57529 100644
--- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerChaosSpec.scala
+++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerChaosSpec.scala
@@ -80,8 +80,8 @@ class ClusterSingletonManagerChaosSpec extends MultiNodeSpec(ClusterSingletonMan
     system.actorOf(ClusterSingletonManager.props(
       singletonProps = Props(classOf[Echo], testActor),
       terminationMessage = PoisonPill,
-      settings = ClusterSingletonManagerSettings(system).withSingletonName("echo")),
-      name = "singleton")
+      settings = ClusterSingletonManagerSettings(system)),
+      name = "echo")
   }
 
   def crash(roles: RoleName*): Unit = {
@@ -94,7 +94,7 @@ class ClusterSingletonManagerChaosSpec extends MultiNodeSpec(ClusterSingletonMan
   }
 
   def echo(oldest: RoleName): ActorSelection =
-    system.actorSelection(RootActorPath(node(oldest).address) / "user" / "singleton" / "echo")
+    system.actorSelection(RootActorPath(node(oldest).address) / "user" / "echo" / "singleton")
 
   def awaitMemberUp(memberProbe: TestProbe, nodes: RoleName*): Unit = {
     runOn(nodes.filterNot(_ == nodes.head): _*) {
diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaveSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaveSpec.scala
index b3b03ca145..85f796432b 100644
--- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaveSpec.scala
+++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaveSpec.scala
@@ -78,13 +78,13 @@ class ClusterSingletonManagerLeaveSpec extends MultiNodeSpec(ClusterSingletonMan
     system.actorOf(ClusterSingletonManager.props(
       singletonProps = Props(classOf[Echo], testActor),
       terminationMessage = PoisonPill,
-      settings = ClusterSingletonManagerSettings(system).withSingletonName("echo")),
-      name = "singleton")
+      settings = ClusterSingletonManagerSettings(system)),
+      name = "echo")
   }
 
   lazy val echoProxy: ActorRef = {
     system.actorOf(ClusterSingletonProxy.props(
-      singletonPath = "/user/singleton/echo",
+      singletonManagerPath = "/user/echo",
       settings = ClusterSingletonProxySettings(system)),
       name = "echoProxy")
   }
diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala
index 4178c5ef03..44802ac86b 100644
--- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala
+++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala
@@ -50,23 +50,14 @@ object ClusterSingletonManagerSpec extends MultiNodeConfig {
     ConfigFactory.parseString("akka.cluster.roles =[worker]"))
 
   object PointToPointChannel {
-
     case object RegisterConsumer
-
     case object UnregisterConsumer
-
     case object RegistrationOk
-
     case object UnexpectedRegistration
-
     case object UnregistrationOk
-
     case object UnexpectedUnregistration
-
     case object Reset
-
     case object ResetOk
-
   }
 
   /**
@@ -154,59 +145,15 @@ object ClusterSingletonManagerSpec extends MultiNodeConfig {
     }
   }
 
-  // documentation of how to keep track of the oldest member in user land
-  //#singleton-proxy
-  class ConsumerProxy extends Actor {
-
-    // subscribe to MemberEvent, re-subscribe when restart
-    override def preStart(): Unit =
-      Cluster(context.system).subscribe(self, classOf[MemberEvent])
-
-    override def postStop(): Unit =
-      Cluster(context.system).unsubscribe(self)
-
-    val role = "worker"
-    // sort by age, oldest first
-    val ageOrdering = Ordering.fromLessThan[Member] {
-      (a, b) ⇒ a.isOlderThan(b)
-    }
-    var membersByAge: immutable.SortedSet[Member] =
-      immutable.SortedSet.empty(ageOrdering)
-
-    def receive = {
-      case state: CurrentClusterState ⇒
-        membersByAge = immutable.SortedSet.empty(ageOrdering) ++ state.members.filter(m ⇒
-          m.status == MemberStatus.Up && m.hasRole(role))
-      case MemberUp(m)         ⇒ if (m.hasRole(role)) membersByAge += m
-      case MemberRemoved(m, _) ⇒ if (m.hasRole(role)) membersByAge -= m
-      case other ⇒ consumer foreach {
-        _.tell(other, sender())
-      }
-    }
-
-    def consumer: Option[ActorSelection] =
-      membersByAge.headOption map (m ⇒ context.actorSelection(
-        RootActorPath(m.address) / "user" / "singleton" / "consumer"))
-  }
-
-  //#singleton-proxy
-
 }
 
 class ClusterSingletonManagerMultiJvmNode1 extends ClusterSingletonManagerSpec
-
 class ClusterSingletonManagerMultiJvmNode2 extends ClusterSingletonManagerSpec
-
 class ClusterSingletonManagerMultiJvmNode3 extends ClusterSingletonManagerSpec
-
 class ClusterSingletonManagerMultiJvmNode4 extends ClusterSingletonManagerSpec
-
 class ClusterSingletonManagerMultiJvmNode5 extends ClusterSingletonManagerSpec
-
 class ClusterSingletonManagerMultiJvmNode6 extends ClusterSingletonManagerSpec
-
 class ClusterSingletonManagerMultiJvmNode7 extends ClusterSingletonManagerSpec
-
 class ClusterSingletonManagerMultiJvmNode8 extends ClusterSingletonManagerSpec
 
 class ClusterSingletonManagerSpec extends MultiNodeSpec(ClusterSingletonManagerSpec) with STMultiNodeSpec with ImplicitSender {
@@ -260,16 +207,15 @@ class ClusterSingletonManagerSpec extends MultiNodeSpec(ClusterSingletonManagerS
     system.actorOf(ClusterSingletonManager.props(
       singletonProps = Props(classOf[Consumer], queue, testActor),
       terminationMessage = End,
-      settings = ClusterSingletonManagerSettings(system)
-        .withSingletonName("consumer").withRole("worker")),
-      name = "singleton")
+      settings = ClusterSingletonManagerSettings(system).withRole("worker")),
+      name = "consumer")
     //#create-singleton-manager
   }
 
   def createSingletonProxy(): ActorRef = {
     //#create-singleton-proxy
     system.actorOf(ClusterSingletonProxy.props(
-      singletonPath = "/user/singleton/consumer",
+      singletonManagerPath = "/user/consumer",
       settings = ClusterSingletonProxySettings(system).withRole("worker")),
       name = "consumerProxy")
     //#create-singleton-proxy
@@ -302,7 +248,7 @@ class ClusterSingletonManagerSpec extends MultiNodeSpec(ClusterSingletonManagerS
   }
 
   def consumer(oldest: RoleName): ActorSelection =
-    system.actorSelection(RootActorPath(node(oldest).address) / "user" / "singleton" / "consumer")
+    system.actorSelection(RootActorPath(node(oldest).address) / "user" / "consumer" / "singleton")
 
   def verifyRegistration(oldest: RoleName): Unit = {
     enterBarrier("before-" + oldest.name + "-registration-verified")
@@ -420,7 +366,7 @@ class ClusterSingletonManagerSpec extends MultiNodeSpec(ClusterSingletonManagerS
       verifyProxyMsg(second, sixth, msg = msg())
 
       runOn(leaveRole) {
-        system.actorSelection("/user/singleton").tell(Identify("singleton"), identifyProbe.ref)
+        system.actorSelection("/user/consumer").tell(Identify("singleton"), identifyProbe.ref)
         identifyProbe.expectMsgPF() {
           case ActorIdentity("singleton", None) ⇒ // already terminated
           case ActorIdentity("singleton", Some(singleton)) ⇒
diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerStartupSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerStartupSpec.scala
index d7c442bb09..f9fddb7153 100644
--- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerStartupSpec.scala
+++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerStartupSpec.scala
@@ -72,13 +72,13 @@ class ClusterSingletonManagerStartupSpec extends MultiNodeSpec(ClusterSingletonM
     system.actorOf(ClusterSingletonManager.props(
       singletonProps = Props(classOf[Echo], testActor),
       terminationMessage = PoisonPill,
-      settings = ClusterSingletonManagerSettings(system).withSingletonName("echo")),
-      name = "singleton")
+      settings = ClusterSingletonManagerSettings(system)),
+      name = "echo")
   }
 
   lazy val echoProxy: ActorRef = {
     system.actorOf(ClusterSingletonProxy.props(
-      singletonPath = "/user/singleton/echo",
+      singletonManagerPath = "/user/echo",
       settings = ClusterSingletonProxySettings(system)),
       name = "echoProxy")
   }
diff --git a/akka-cluster-tools/src/test/java/akka/cluster/singleton/ClusterSingletonManagerTest.java b/akka-cluster-tools/src/test/java/akka/cluster/singleton/ClusterSingletonManagerTest.java
index 45ac45aa02..e02e9f24d9 100644
--- a/akka-cluster-tools/src/test/java/akka/cluster/singleton/ClusterSingletonManagerTest.java
+++ b/akka-cluster-tools/src/test/java/akka/cluster/singleton/ClusterSingletonManagerTest.java
@@ -31,16 +31,18 @@ public class ClusterSingletonManagerTest {
     final ActorRef testActor = null;
 
     //#create-singleton-manager
-    final ClusterSingletonManagerSettings settings = ClusterSingletonManagerSettings.create(system)
-        .withSingletonName("consumer").withRole("worker");
-    system.actorOf(ClusterSingletonManager.props(Props.create(Consumer.class, queue, testActor), 
-        new End(), settings), "singleton");
+    final ClusterSingletonManagerSettings settings =
+      ClusterSingletonManagerSettings.create(system).withRole("worker");
+    system.actorOf(ClusterSingletonManager.props(
+      Props.create(Consumer.class, queue, testActor),
+      new End(), settings), "consumer");
     //#create-singleton-manager
 
     //#create-singleton-proxy
-    ClusterSingletonProxySettings proxySettings = 
+    ClusterSingletonProxySettings proxySettings =
         ClusterSingletonProxySettings.create(system).withRole("worker");
-    system.actorOf(ClusterSingletonProxy.props("user/singleton/consumer", proxySettings), "consumerProxy");
+    system.actorOf(ClusterSingletonProxy.props("/user/consumer", proxySettings), 
+        "consumerProxy");
     //#create-singleton-proxy
   }
 
diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonProxySpec.scala b/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonProxySpec.scala
index 659f2b55de..227cd5d46d 100644
--- a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonProxySpec.scala
+++ b/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonProxySpec.scala
@@ -46,7 +46,7 @@ object ClusterSingletonProxySpec {
         name = "singletonManager")
     }
 
-    val proxy = system.actorOf(ClusterSingletonProxy.props("user/singletonManager/singleton",
+    val proxy = system.actorOf(ClusterSingletonProxy.props("user/singletonManager",
       settings = ClusterSingletonProxySettings(system)), s"singletonProxy-${cluster.selfAddress.port.getOrElse(0)}")
 
     def testProxy(msg: String) {
diff --git a/akka-docs/rst/project/migration-guide-2.3.x-2.4.x.rst b/akka-docs/rst/project/migration-guide-2.3.x-2.4.x.rst
index 04d6d1f3e2..0229271e94 100644
--- a/akka-docs/rst/project/migration-guide-2.3.x-2.4.x.rst
+++ b/akka-docs/rst/project/migration-guide-2.3.x-2.4.x.rst
@@ -255,6 +255,12 @@ The buffer size of the ``ClusterSingletonProxy`` can be defined in the ``Cluster
 instead of defining ``stash-capacity`` of the mailbox. Buffering can be disabled by using a 
 buffer size of 0.
 
+The ``singletonPath`` parameter of ``ClusterSingletonProxy.props`` has changed. It is now named 
+``singletonManagerPath`` and is the logical path of the singleton manager, e.g. ``/user/singletonManager``,
+which ends with the name you defined in ``actorOf`` when creating the ``ClusterSingletonManager``.
+In 2.3.x it was the path to singleton instance, which was error-prone because one had to provide both
+the name of the singleton manager and the singleton actor.
+
 DistributedPubSub construction
 ==============================
 
diff --git a/akka-docs/rst/scala/cluster-singleton.rst b/akka-docs/rst/scala/cluster-singleton.rst
index ea4ba7a356..25dcc4458c 100644
--- a/akka-docs/rst/scala/cluster-singleton.rst
+++ b/akka-docs/rst/scala/cluster-singleton.rst
@@ -89,22 +89,12 @@ In Scala:
 
 .. includecode:: ../../../akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala#create-singleton-manager
 
-Here we limit the singleton to nodes tagged with the ``"worker"`` role, but all nodes, independent of
-role, can be used by specifying ``None`` as ``role`` parameter.
-
-The corresponding Java API for the ``singletonProps`` function is ``akka.cluster.singleton.ClusterSingletonPropsFactory``.
-The Java API takes a plain String for the role parameter and ``null`` means that all nodes, independent of
-role, are used.
-
 In Java:
 
 .. includecode:: ../../../akka-cluster-tools/src/test/java/akka/cluster/singleton/ClusterSingletonManagerTest.java#create-singleton-manager
 
-.. note::
-
-  The ``singletonProps``/``singletonPropsFactory`` is invoked when creating
-  the singleton actor and it must not use members that are not thread safe, e.g.
-  mutable state in enclosing actor.
+Here we limit the singleton to nodes tagged with the ``"worker"`` role, but all nodes, independent of
+role, can be used by not specifying ``withRole``.
 
 Here we use an application specific ``terminationMessage`` to be able to close the
 resources before actually stopping the singleton actor. Note that ``PoisonPill`` is a
diff --git a/akka-samples/akka-sample-cluster-java/src/main/java/sample/cluster/stats/StatsSampleOneMasterMain.java b/akka-samples/akka-sample-cluster-java/src/main/java/sample/cluster/stats/StatsSampleOneMasterMain.java
index c620e45df6..30ad9d7d94 100644
--- a/akka-samples/akka-sample-cluster-java/src/main/java/sample/cluster/stats/StatsSampleOneMasterMain.java
+++ b/akka-samples/akka-sample-cluster-java/src/main/java/sample/cluster/stats/StatsSampleOneMasterMain.java
@@ -35,16 +35,16 @@ public class StatsSampleOneMasterMain {
 
       //#create-singleton-manager
       ClusterSingletonManagerSettings settings = ClusterSingletonManagerSettings.create(system)
-          .withSingletonName("statsService").withRole("compute");
+          .withRole("compute");
       system.actorOf(ClusterSingletonManager.props(
           Props.create(StatsService.class), PoisonPill.getInstance(), settings),
-          "singleton");
+          "statsService");
       //#create-singleton-manager
 
       //#singleton-proxy
       ClusterSingletonProxySettings proxySettings =
           ClusterSingletonProxySettings.create(system).withRole("compute");
-      system.actorOf(ClusterSingletonProxy.props("/user/singleton/statsService",
+      system.actorOf(ClusterSingletonProxy.props("/user/statsService",
           proxySettings), "statsServiceProxy");
       //#singleton-proxy
     }
diff --git a/akka-samples/akka-sample-cluster-java/src/main/resources/stats2.conf b/akka-samples/akka-sample-cluster-java/src/main/resources/stats2.conf
index 1eee48fd52..706c21fafe 100644
--- a/akka-samples/akka-sample-cluster-java/src/main/resources/stats2.conf
+++ b/akka-samples/akka-sample-cluster-java/src/main/resources/stats2.conf
@@ -2,7 +2,7 @@ include "application"
 
 # //#config-router-deploy
 akka.actor.deployment {
-  /singleton/statsService/workerRouter {
+  /statsService/singleton/workerRouter {
     router = consistent-hashing-pool
     nr-of-instances = 100
     cluster {
diff --git a/akka-samples/akka-sample-cluster-java/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala b/akka-samples/akka-sample-cluster-java/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala
index 89c6b1ec13..6152795903 100644
--- a/akka-samples/akka-sample-cluster-java/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala
+++ b/akka-samples/akka-sample-cluster-java/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala
@@ -54,7 +54,7 @@ object StatsSampleSingleMasterSpecConfig extends MultiNodeConfig {
     akka.cluster.roles = [compute]
     #//#router-deploy-config
     akka.actor.deployment {
-      /singleton/statsService/workerRouter {
+      /statsService/singleton/workerRouter {
           router = consistent-hashing-pool
           nr-of-instances = 100
           cluster {
@@ -105,10 +105,10 @@ abstract class StatsSampleSingleMasterSpec extends MultiNodeSpec(StatsSampleSing
       system.actorOf(ClusterSingletonManager.props(
         Props[StatsService],
         terminationMessage = PoisonPill,
-        settings = ClusterSingletonManagerSettings(system).withSingletonName("statsService")),
-        name = "singleton")
+        settings = ClusterSingletonManagerSettings(system)),
+        name = "statsService")
 
-      system.actorOf(ClusterSingletonProxy.props("/user/singleton/statsService",
+      system.actorOf(ClusterSingletonProxy.props("/user/statsService",
         ClusterSingletonProxySettings(system).withRole("compute")), "statsServiceProxy")
 
       testConductor.enter("all-up")
diff --git a/akka-samples/akka-sample-cluster-scala/src/main/resources/stats2.conf b/akka-samples/akka-sample-cluster-scala/src/main/resources/stats2.conf
index 1eee48fd52..706c21fafe 100644
--- a/akka-samples/akka-sample-cluster-scala/src/main/resources/stats2.conf
+++ b/akka-samples/akka-sample-cluster-scala/src/main/resources/stats2.conf
@@ -2,7 +2,7 @@ include "application"
 
 # //#config-router-deploy
 akka.actor.deployment {
-  /singleton/statsService/workerRouter {
+  /statsService/singleton/workerRouter {
     router = consistent-hashing-pool
     nr-of-instances = 100
     cluster {
diff --git a/akka-samples/akka-sample-cluster-scala/src/main/scala/sample/cluster/stats/StatsSampleOneMaster.scala b/akka-samples/akka-sample-cluster-scala/src/main/scala/sample/cluster/stats/StatsSampleOneMaster.scala
index c6f28788a3..f4db5403be 100644
--- a/akka-samples/akka-sample-cluster-scala/src/main/scala/sample/cluster/stats/StatsSampleOneMaster.scala
+++ b/akka-samples/akka-sample-cluster-scala/src/main/scala/sample/cluster/stats/StatsSampleOneMaster.scala
@@ -33,13 +33,12 @@ object StatsSampleOneMaster {
       system.actorOf(ClusterSingletonManager.props(
         singletonProps = Props[StatsService],
         terminationMessage = PoisonPill,
-        settings = ClusterSingletonManagerSettings(system)
-          .withSingletonName("statsService").withRole("compute")),
-        name = "singleton")
+        settings = ClusterSingletonManagerSettings(system).withRole("compute")),
+        name = "statsService")
       //#create-singleton-manager
 
       //#singleton-proxy
-      system.actorOf(ClusterSingletonProxy.props(singletonPath = "/user/singleton/statsService",
+      system.actorOf(ClusterSingletonProxy.props(singletonManagerPath = "/user/statsService",
         settings = ClusterSingletonProxySettings(system).withRole("compute")),
         name = "statsServiceProxy")
       //#singleton-proxy
diff --git a/akka-samples/akka-sample-cluster-scala/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala b/akka-samples/akka-sample-cluster-scala/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala
index 9b31858deb..a750d98064 100644
--- a/akka-samples/akka-sample-cluster-scala/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala
+++ b/akka-samples/akka-sample-cluster-scala/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala
@@ -53,7 +53,7 @@ object StatsSampleSingleMasterSpecConfig extends MultiNodeConfig {
     akka.cluster.roles = [compute]
     #//#router-deploy-config
     akka.actor.deployment {
-      /singleton/statsService/workerRouter {
+      /statsService/singleton/workerRouter {
           router = consistent-hashing-pool
           nr-of-instances = 100
           cluster {
@@ -103,11 +103,10 @@ abstract class StatsSampleSingleMasterSpec extends MultiNodeSpec(StatsSampleSing
 
       system.actorOf(ClusterSingletonManager.props(
         singletonProps = Props[StatsService], terminationMessage = PoisonPill,
-        settings = ClusterSingletonManagerSettings(system)
-          .withSingletonName("statsService").withRole("compute")),
-        name = "singleton")
+        settings = ClusterSingletonManagerSettings(system).withRole("compute")),
+        name = "statsService")
 
-      system.actorOf(ClusterSingletonProxy.props(singletonPath = "/user/singleton/statsService",
+      system.actorOf(ClusterSingletonProxy.props(singletonManagerPath = "/user/statsService",
         ClusterSingletonProxySettings(system).withRole("compute")),
         name = "statsServiceProxy")