diff --git a/akka-docs/src/test/java/jdocs/persistence/testkit/PersistenceTestKitPolicySampleTest.java b/akka-docs/src/test/java/jdocs/persistence/testkit/PersistenceTestKitPolicySampleTest.java
index 1abbcea348..2d61d16da7 100644
--- a/akka-docs/src/test/java/jdocs/persistence/testkit/PersistenceTestKitPolicySampleTest.java
+++ b/akka-docs/src/test/java/jdocs/persistence/testkit/PersistenceTestKitPolicySampleTest.java
@@ -36,7 +36,7 @@ public class PersistenceTestKitPolicySampleTest extends AbstractJavaTest {
   @Before
   public void beforeEach() {
     persistenceTestKit.clearAll();
-    persistenceTestKit.returnDefaultPolicy();
+    persistenceTestKit.resetPolicy();
   }
 
   @Test
diff --git a/akka-docs/src/test/scala/docs/persistence/testkit/TestKitExamples.scala b/akka-docs/src/test/scala/docs/persistence/testkit/TestKitExamples.scala
index 68c16c2e18..a10029da9a 100644
--- a/akka-docs/src/test/scala/docs/persistence/testkit/TestKitExamples.scala
+++ b/akka-docs/src/test/scala/docs/persistence/testkit/TestKitExamples.scala
@@ -128,7 +128,7 @@ class PersistenceTestKitSampleSpecWithPolicy
 
   override def beforeEach(): Unit = {
     persistenceTestKit.clearAll()
-    persistenceTestKit.returnDefaultPolicy()
+    persistenceTestKit.resetPolicy()
   }
 
   "Testkit policy" should {
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/TestKitStorage.scala b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/TestKitStorage.scala
index 76ab2a0c9c..3b28acc2dc 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/TestKitStorage.scala
+++ b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/TestKitStorage.scala
@@ -143,7 +143,7 @@ sealed trait PolicyOps[U] {
 
   def setPolicy(policy: Policy): Unit = _processingPolicy.set(policy)
 
-  def returnDefaultPolicy(): Unit = setPolicy(DefaultPolicy)
+  def resetPolicy(): Unit = setPolicy(DefaultPolicy)
 
 }
 
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/PersistenceTestKit.scala b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/PersistenceTestKit.scala
index f540b1d143..1e01da1b44 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/PersistenceTestKit.scala
+++ b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/PersistenceTestKit.scala
@@ -431,7 +431,7 @@ class PersistenceTestKit(system: ActorSystem) {
   /**
    * Returns default policy if it was changed by [[PersistenceTestKit.withPolicy()]].
    */
-  def returnDefaultPolicy(): Unit = scalaTestkit.returnDefaultPolicy()
+  def resetPolicy(): Unit = scalaTestkit.resetPolicy()
 
 }
 
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/SnapshotTestKit.scala b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/SnapshotTestKit.scala
index 4e3b0f4e50..11e4806c33 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/SnapshotTestKit.scala
+++ b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/SnapshotTestKit.scala
@@ -258,7 +258,7 @@ class SnapshotTestKit(system: ActorSystem) {
   /**
    * Returns default policy if it was changed by [[SnapshotTestKit.withPolicy()]].
    */
-  def returnDefaultPolicy(): Unit = scalaTestkit.returnDefaultPolicy()
+  def resetPolicy(): Unit = scalaTestkit.resetPolicy()
 
 }
 
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/TestOps.scala b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/TestOps.scala
index 4028b84e5e..5ff497a955 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/TestOps.scala
+++ b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/TestOps.scala
@@ -109,7 +109,7 @@ private[testkit] trait PolicyOpsTestKit[P] extends {
   /**
    * Returns default policy if it was changed by [[PolicyOpsTestKit.this.withPolicy()]].
    */
-  def returnDefaultPolicy(): Unit = storage.returnDefaultPolicy()
+  def resetPolicy(): Unit = storage.resetPolicy()
 
 }
 
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonSnapshotTests.scala b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonSnapshotTests.scala
index b5a4d15c13..4011529e95 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonSnapshotTests.scala
+++ b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonSnapshotTests.scala
@@ -91,7 +91,7 @@ trait CommonSnapshotTests extends JavaDslUtils {
       expectMsgPF() { case SaveSnapshotSuccess(_) => }
       expectNextPersisted(pid, 777)
 
-      returnDefaultPolicy()
+      resetPolicy()
 
     }
 
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonTestKitTests.scala b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonTestKitTests.scala
index 1712bb37b2..2095741ab0 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonTestKitTests.scala
+++ b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonTestKitTests.scala
@@ -134,7 +134,7 @@ trait CommonTestKitTests extends JavaDslUtils {
 
       expectNextPersisted(pid, B(666))
 
-      returnDefaultPolicy()
+      resetPolicy()
 
     }
 
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonSnapshotTests.scala b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonSnapshotTests.scala
index 5336d6ba5d..6a3f8756e4 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonSnapshotTests.scala
+++ b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonSnapshotTests.scala
@@ -111,7 +111,7 @@ trait CommonSnapshotTests extends ScalaDslUtils {
       expectMsgPF() { case SaveSnapshotSuccess(_) => }
       expectNextPersisted(pid, 777)
 
-      returnDefaultPolicy()
+      resetPolicy()
 
     }
 
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonTestKitTests.scala b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonTestKitTests.scala
index 5558b6a63a..6acd0ac63d 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonTestKitTests.scala
+++ b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonTestKitTests.scala
@@ -150,7 +150,7 @@ trait CommonTestKitTests extends ScalaDslUtils {
       aa ! B(666)
 
       expectNextPersisted(pid, B(666))
-      returnDefaultPolicy()
+      resetPolicy()
 
     }