diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LargeClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/LargeClusterSpec.scala
index 97711b30de..dd6a421819 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LargeClusterSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/LargeClusterSpec.scala
@@ -100,7 +100,7 @@ abstract class LargeClusterSpec
    */
   override def cluster: Cluster = Cluster(system)
 
-  override def atTermination(): Unit = {
+  override def afterTermination(): Unit = {
     systems foreach { _.shutdown }
     val shutdownTimeout = 20.seconds
     val deadline = Deadline.now + shutdownTimeout
diff --git a/akka-docs/rst/modules/code/docs/actor/mailbox/DurableMailboxDocSpec.scala b/akka-docs/rst/modules/code/docs/actor/mailbox/DurableMailboxDocSpec.scala
index 4c2880f53d..018a14fcc0 100644
--- a/akka-docs/rst/modules/code/docs/actor/mailbox/DurableMailboxDocSpec.scala
+++ b/akka-docs/rst/modules/code/docs/actor/mailbox/DurableMailboxDocSpec.scala
@@ -127,7 +127,7 @@ class MyMailboxSpec extends DurableMailboxSpec("MyStorage", MyMailboxSpec.config
   override def atStartup() {
   }
 
-  override def atTermination() {
+  override def afterTermination() {
   }
 
   "MyMailbox" must {
diff --git a/akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala b/akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala
index 0816d262a6..ddea525a13 100644
--- a/akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala
+++ b/akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala
@@ -28,7 +28,7 @@ class RemoteDeploymentDocSpec extends AkkaSpec("""
   val other = ActorSystem("remote", system.settings.config)
   val address = other.asInstanceOf[ExtendedActorSystem].provider.getExternalAddressFor(Address("tcp.akka", "s", "host", 1)).get
 
-  override def atTermination() { other.shutdown() }
+  override def afterTermination() { other.shutdown() }
 
   "demonstrate programmatic deployment" in {
     //#deploy
diff --git a/akka-durable-mailboxes/akka-file-mailbox/src/test/scala/akka/actor/mailbox/filebased/FileBasedMailboxSpec.scala b/akka-durable-mailboxes/akka-file-mailbox/src/test/scala/akka/actor/mailbox/filebased/FileBasedMailboxSpec.scala
index e0271461e8..1ba5f23f1c 100644
--- a/akka-durable-mailboxes/akka-file-mailbox/src/test/scala/akka/actor/mailbox/filebased/FileBasedMailboxSpec.scala
+++ b/akka-durable-mailboxes/akka-file-mailbox/src/test/scala/akka/actor/mailbox/filebased/FileBasedMailboxSpec.scala
@@ -45,8 +45,8 @@ class FileBasedMailboxSpec extends DurableMailboxSpec("File", FileBasedMailboxSp
     super.atStartup()
   }
 
-  override def atTermination() {
+  override def afterTermination() {
     clean()
-    super.atTermination()
+    super.afterTermination()
   }
 }
diff --git a/akka-durable-mailboxes/akka-mailboxes-common/src/test/scala/akka/actor/mailbox/DurableMailboxSpec.scala b/akka-durable-mailboxes/akka-mailboxes-common/src/test/scala/akka/actor/mailbox/DurableMailboxSpec.scala
index 2c6706f693..decfec6014 100644
--- a/akka-durable-mailboxes/akka-mailboxes-common/src/test/scala/akka/actor/mailbox/DurableMailboxSpec.scala
+++ b/akka-durable-mailboxes/akka-mailboxes-common/src/test/scala/akka/actor/mailbox/DurableMailboxSpec.scala
@@ -84,14 +84,14 @@ abstract class DurableMailboxSpec(system: ActorSystem, val backendName: String)
     try system.awaitTermination(5 seconds) catch {
       case _: TimeoutException ⇒ system.log.warning("Failed to stop [{}] within 5 seconds", system.name)
     }
-    atTermination()
+    afterTermination()
   }
 
   /**
    * May be implemented in concrete subclass to do additional things once after all
    * test cases have been run.
    */
-  def atTermination() {}
+  def afterTermination() {}
 
   protected def streamMustContain(in: InputStream, words: String): Unit = {
     val output = new Array[Byte](8192)
diff --git a/akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala b/akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
index d2d7ad50d5..ec926dd3af 100644
--- a/akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
+++ b/akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
@@ -272,7 +272,7 @@ abstract class MultiNodeSpec(val myself: RoleName, _system: ActorSystem, _roles:
         if (verifySystemShutdown) throw new RuntimeException(msg)
         else system.log.warning(msg)
     }
-    atTermination()
+    afterTermination()
   }
 
   /**
@@ -293,7 +293,7 @@ abstract class MultiNodeSpec(val myself: RoleName, _system: ActorSystem, _roles:
   /**
    * Override this method to do something when the whole test is terminating.
    */
-  protected def atTermination(): Unit = {}
+  protected def afterTermination(): Unit = {}
 
   /**
    * All registered roles
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteCommunicationSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteCommunicationSpec.scala
index 8e619d8bb3..7e27c1ffc1 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteCommunicationSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteCommunicationSpec.scala
@@ -75,7 +75,7 @@ akka {
 
   val here = system.actorFor(RootActorPath(remoteAddr) / "user" / "echo")
 
-  override def atTermination() {
+  override def afterTermination() {
     other.shutdown()
   }
 
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala
index 1b21a5c4bd..95eb10f3af 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala
@@ -31,7 +31,7 @@ akka {
       EventFilter.warning(pattern = "received dead letter.*Disassociate")))
   }
 
-  override def atTermination() {
+  override def afterTermination() {
     other.shutdown()
   }
 
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala
index e3031a7cc2..869a45445f 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala
@@ -70,7 +70,7 @@ akka.actor.deployment {
 }""").withFallback(system.settings.config)
   val otherSystem = ActorSystem("remote-sys", conf)
 
-  override def atTermination() {
+  override def afterTermination() {
     otherSystem.shutdown()
   }
 
diff --git a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
index 4a8e691b7d..177fb49a9a 100644
--- a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
@@ -114,7 +114,7 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
 
   val here = system.actorFor("test.akka://remote-sys@localhost:12346/user/echo")
 
-  override def atTermination() {
+  override def afterTermination() {
     other.shutdown()
     AssociationRegistry.clear()
   }
diff --git a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala
index 7498cf269c..73d857aefc 100644
--- a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala
@@ -125,7 +125,7 @@ abstract class Ticket1978CommunicationSpec(val cipherConfig: CipherConfig) exten
     "remote-sys",
     ConfigFactory.parseString("akka.remote.netty.port=" + cipherConfig.remotePort).withFallback(system.settings.config))
 
-  override def atTermination() {
+  override def afterTermination() {
     if (cipherConfig.runTest) {
       other.shutdown()
       other.awaitTermination()
diff --git a/akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala b/akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala
index 03b8b5a921..8e555ee9f6 100644
--- a/akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala
@@ -37,7 +37,7 @@ akka.loglevel = DEBUG
   val target1 = other.actorFor(RootActorPath(addr) / "remote")
   val target2 = other.actorFor(RootActorPath(addr) / testActor.path.elements)
 
-  override def atTermination() {
+  override def afterTermination() {
     other.shutdown()
   }
 
diff --git a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala
index eba8670d79..0d2dcb002e 100644
--- a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala
+++ b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala
@@ -96,6 +96,6 @@ class AkkaProtocolStressTest extends AkkaSpec(configA) with ImplicitSender with
       EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate)")))
   }
 
-  override def atTermination(): Unit = systemB.shutdown()
+  override def afterTermination(): Unit = systemB.shutdown()
 
 }
diff --git a/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala b/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala
index 8795c62412..134f58ee09 100644
--- a/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala
@@ -89,7 +89,7 @@ class ThrottlerTransportAdapterSpec extends AkkaSpec(configA) with ImplicitSende
       EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate)")))
   }
 
-  override def atTermination(): Unit = systemB.shutdown()
+  override def afterTermination(): Unit = systemB.shutdown()
 }
 
 class ThrottlerTransportAdapterGenericSpec extends GenericTransportSpec(withAkkaProtocol = true) {
diff --git a/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala b/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala
index 1ed8e22384..d1fc341447 100644
--- a/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala
+++ b/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala
@@ -77,14 +77,14 @@ abstract class AkkaSpec(_system: ActorSystem)
         system.log.warning("Failed to stop [{}] within 5 seconds", system.name)
         println(system.asInstanceOf[ActorSystemImpl].printTree)
     }
-    atTermination()
+    afterTermination()
   }
 
   protected def atStartup() {}
 
   protected def beforeTermination() {}
 
-  protected def atTermination() {}
+  protected def afterTermination() {}
 
   def spawn(dispatcherId: String = Dispatchers.DefaultDispatcherId)(body: ⇒ Unit): Unit =
     Future(body)(system.dispatchers.lookup(dispatcherId))