diff --git a/akka-actor/src/main/scala/akka/actor/DeploymentConfig.scala b/akka-actor/src/main/scala/akka/actor/DeploymentConfig.scala
index 8418bab58a..6c9e209cd7 100644
--- a/akka-actor/src/main/scala/akka/actor/DeploymentConfig.scala
+++ b/akka-actor/src/main/scala/akka/actor/DeploymentConfig.scala
@@ -184,12 +184,12 @@ object DeploymentConfig {
   def isHomeNode(homes: Iterable[Home]): Boolean = homes exists (home ⇒ nodeNameFor(home) == Config.nodename)
 
   def failureDetectorTypeFor(failureDetector: FailureDetector): FailureDetectorType = failureDetector match {
-    case NoOpFailureDetector                             ⇒ FailureDetectorType.NoOpFailureDetector
-    case NoOpFailureDetector()                           ⇒ FailureDetectorType.NoOpFailureDetector
-    case BannagePeriodFailureDetector(timeToBan)         ⇒ FailureDetectorType.BannagePeriodFailureDetector(timeToBan)
-    case RemoveConnectionOnFirstFailureFailureDetector   ⇒ FailureDetectorType.RemoveConnectionOnFirstFailureFailureDetector
-    case RemoveConnectionOnFirstFailureFailureDetector() ⇒ FailureDetectorType.RemoveConnectionOnFirstFailureFailureDetector
-    case CustomFailureDetector(implClass)                ⇒ FailureDetectorType.CustomFailureDetector(implClass)
+    case NoOpFailureDetector                             ⇒ FailureDetectorType.NoOp
+    case NoOpFailureDetector()                           ⇒ FailureDetectorType.NoOp
+    case BannagePeriodFailureDetector(timeToBan)         ⇒ FailureDetectorType.BannagePeriod(timeToBan)
+    case RemoveConnectionOnFirstFailureFailureDetector   ⇒ FailureDetectorType.RemoveConnectionOnFirstFailure
+    case RemoveConnectionOnFirstFailureFailureDetector() ⇒ FailureDetectorType.RemoveConnectionOnFirstFailure
+    case CustomFailureDetector(implClass)                ⇒ FailureDetectorType.Custom(implClass)
     case unknown                                         ⇒ throw new UnsupportedOperationException("Unknown FailureDetector [" + unknown + "]")
   }
 
diff --git a/akka-actor/src/main/scala/akka/routing/RoutedProps.scala b/akka-actor/src/main/scala/akka/routing/RoutedProps.scala
index 3f74b0742d..c6bfa97c3f 100644
--- a/akka-actor/src/main/scala/akka/routing/RoutedProps.scala
+++ b/akka-actor/src/main/scala/akka/routing/RoutedProps.scala
@@ -19,11 +19,10 @@ sealed trait FailureDetectorType
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
 object FailureDetectorType {
-  // TODO shorten names to NoOp, BannagePeriod etc.
-  case object NoOpFailureDetector extends FailureDetectorType
-  case object RemoveConnectionOnFirstFailureFailureDetector extends FailureDetectorType
-  case class BannagePeriodFailureDetector(timeToBan: Duration) extends FailureDetectorType
-  case class CustomFailureDetector(className: String) extends FailureDetectorType
+  case object NoOp extends FailureDetectorType
+  case object RemoveConnectionOnFirstFailure extends FailureDetectorType
+  case class BannagePeriod(timeToBan: Duration) extends FailureDetectorType
+  case class Custom(className: String) extends FailureDetectorType
 }
 
 sealed trait RouterType
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
index 12f1cdba39..c10ca60c7a 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
@@ -47,10 +47,10 @@ class RemoteActorRefProvider extends ActorRefProvider {
           case Some(DeploymentConfig.Deploy(_, _, routerType, nrOfInstances, failureDetectorType, DeploymentConfig.RemoteScope(remoteAddresses))) ⇒
 
             val failureDetector = DeploymentConfig.failureDetectorTypeFor(failureDetectorType) match {
-              case FailureDetectorType.NoOpFailureDetector                           ⇒ new NoOpFailureDetector
-              case FailureDetectorType.RemoveConnectionOnFirstFailureFailureDetector ⇒ new RemoveConnectionOnFirstFailureFailureDetector
-              case FailureDetectorType.BannagePeriodFailureDetector(timeToBan)       ⇒ new BannagePeriodFailureDetector(timeToBan)
-              case FailureDetectorType.CustomFailureDetector(implClass)              ⇒ FailureDetector.createCustomFailureDetector(implClass)
+              case FailureDetectorType.NoOp                           ⇒ new NoOpFailureDetector
+              case FailureDetectorType.RemoveConnectionOnFirstFailure ⇒ new RemoveConnectionOnFirstFailureFailureDetector
+              case FailureDetectorType.BannagePeriod(timeToBan)       ⇒ new BannagePeriodFailureDetector(timeToBan)
+              case FailureDetectorType.Custom(implClass)              ⇒ FailureDetector.createCustomFailureDetector(implClass)
             }
 
             val thisHostname = Remote.address.getHostName