diff --git a/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorJavaDslTest.java b/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorJavaDslTest.java
index 2a9adbbf11..5a382475e3 100644
--- a/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorJavaDslTest.java
+++ b/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorJavaDslTest.java
@@ -190,9 +190,9 @@ public class PersistentActorJavaDslTest extends JUnitSuite {
   private static class CounterBehavior extends EventSourcedBehavior<Command, Incremented, State> {
     private final ActorContext<Command> ctx;
 
-    CounterBehavior(PersistenceId persistentId, ActorContext<Command> ctx) {
+    CounterBehavior(PersistenceId persistenceId, ActorContext<Command> ctx) {
       super(
-          persistentId,
+          persistenceId,
           SupervisorStrategy.restartWithBackoff(Duration.ofMillis(1), Duration.ofMillis(5), 0.1));
       this.ctx = ctx;
     }
diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/ReplayFilter.scala b/akka-persistence/src/main/scala/akka/persistence/journal/ReplayFilter.scala
index 38a7fc5e79..17fe0ef192 100644
--- a/akka-persistence/src/main/scala/akka/persistence/journal/ReplayFilter.scala
+++ b/akka-persistence/src/main/scala/akka/persistence/journal/ReplayFilter.scala
@@ -80,7 +80,7 @@ private[akka] class ReplayFilter(
           if (r.persistent.sequenceNr < seqNo) {
             val errMsg = s"Invalid replayed event [sequenceNr=${r.persistent.sequenceNr}, writerUUID=${r.persistent.writerUuid}] as " +
               s"the sequenceNr should be equal to or greater than already-processed event [sequenceNr=${seqNo}, writerUUID=${writerUuid}] from the same writer, for the same persistenceId [${r.persistent.persistenceId}]. " +
-              "Perhaps, events were journaled out of sequence, or duplicate persistentId for different entities?"
+              "Perhaps, events were journaled out of sequence, or duplicate persistenceId for different entities?"
             logIssue(errMsg)
             mode match {
               case RepairByDiscardOld => // discard
@@ -98,7 +98,7 @@ private[akka] class ReplayFilter(
           // from old writer
           val errMsg = s"Invalid replayed event [sequenceNr=${r.persistent.sequenceNr}, writerUUID=${r.persistent.writerUuid}]. " +
             s"There was already a newer writer whose last replayed event was [sequenceNr=${seqNo}, writerUUID=${writerUuid}] for the same persistenceId [${r.persistent.persistenceId}]." +
-            "Perhaps, the old writer kept journaling messages after the new writer created, or duplicate persistentId for different entities?"
+            "Perhaps, the old writer kept journaling messages after the new writer created, or duplicate persistenceId for different entities?"
           logIssue(errMsg)
           mode match {
             case RepairByDiscardOld => // discard
@@ -124,7 +124,7 @@ private[akka] class ReplayFilter(
             if (msg.persistent.sequenceNr >= seqNo) {
               val errMsg = s"Invalid replayed event [sequenceNr=${r.persistent.sequenceNr}, writerUUID=${r.persistent.writerUuid}] from a new writer. " +
                 s"An older writer already sent an event [sequenceNr=${msg.persistent.sequenceNr}, writerUUID=${msg.persistent.writerUuid}] whose sequence number was equal or greater for the same persistenceId [${r.persistent.persistenceId}]. " +
-                "Perhaps, the new writer journaled the event out of sequence, or duplicate persistentId for different entities?"
+                "Perhaps, the new writer journaled the event out of sequence, or duplicate persistenceId for different entities?"
               logIssue(errMsg)
               mode match {
                 case RepairByDiscardOld => iter.remove() // discard