You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by fa...@apache.org on 2023/06/07 13:52:03 UTC

[incubator-pekko] branch main updated: fix up refs to Akka in source code (#374)

This is an automated email from the ASF dual-hosted git repository.

fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko.git


The following commit(s) were added to refs/heads/main by this push:
     new 1612950702 fix up refs to Akka in source code (#374)
1612950702 is described below

commit 1612950702d4dc8107f336442c7617cc67e22eda
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Wed Jun 7 14:51:57 2023 +0100

    fix up refs to Akka in source code (#374)
    
    * fix up refs to Akka in source code
    
    * Update distributed-data.md
---
 .../apache/pekko/actor/testkit/typed/scaladsl/ActorTestKit.scala  | 2 +-
 .../test/scala/org/apache/pekko/serialization/SerializeSpec.scala | 2 +-
 .../src/main/scala/org/apache/pekko/actor/typed/ActorSystem.scala | 6 +++---
 .../apache/pekko/actor/typed/delivery/ConsumerController.scala    | 2 +-
 .../scala/org/apache/pekko/actor/typed/javadsl/ActorContext.scala | 2 +-
 .../org/apache/pekko/actor/typed/scaladsl/ActorContext.scala      | 2 +-
 .../org/apache/pekko/actor/typed/scaladsl/adapter/package.scala   | 2 +-
 actor/src/main/scala/org/apache/pekko/NotUsed.scala               | 2 +-
 actor/src/main/scala/org/apache/pekko/actor/ActorRef.scala        | 4 ++--
 actor/src/main/scala/org/apache/pekko/actor/ActorSystem.scala     | 6 +++---
 .../main/scala/org/apache/pekko/actor/CoordinatedShutdown.scala   | 8 ++++----
 actor/src/main/scala/org/apache/pekko/actor/Deployer.scala        | 2 +-
 actor/src/main/scala/org/apache/pekko/actor/DynamicAccess.scala   | 2 +-
 actor/src/main/scala/org/apache/pekko/actor/Extension.scala       | 4 ++--
 actor/src/main/scala/org/apache/pekko/actor/Scheduler.scala       | 2 +-
 actor/src/main/scala/org/apache/pekko/actor/TypedActor.scala      | 2 +-
 .../main/scala/org/apache/pekko/dispatch/AbstractDispatcher.scala | 2 +-
 actor/src/main/scala/org/apache/pekko/dispatch/Mailbox.scala      | 4 ++--
 actor/src/main/scala/org/apache/pekko/io/Dns.scala                | 2 +-
 actor/src/main/scala/org/apache/pekko/io/DnsProvider.scala        | 2 +-
 actor/src/main/scala/org/apache/pekko/pattern/AskSupport.scala    | 2 +-
 .../src/main/scala/org/apache/pekko/pattern/CircuitBreaker.scala  | 8 ++++----
 .../scala/org/apache/pekko/pattern/CircuitBreakersRegistry.scala  | 2 +-
 actor/src/main/scala/org/apache/pekko/pattern/Patterns.scala      | 4 ++--
 actor/src/main/scala/org/apache/pekko/pattern/StatusReply.scala   | 6 +++---
 .../main/scala/org/apache/pekko/pattern/extended/package.scala    | 2 +-
 .../scala/org/apache/pekko/serialization/AsyncSerializer.scala    | 4 ++--
 .../main/scala/org/apache/pekko/serialization/Serialization.scala | 2 +-
 .../org/apache/pekko/serialization/SerializationExtension.scala   | 2 +-
 .../main/scala/org/apache/pekko/serialization/Serializer.scala    | 4 ++--
 bench-jmh/README.md                                               | 2 +-
 .../sharding/typed/delivery/ShardingConsumerController.scala      | 2 +-
 .../pekko/cluster/sharding/typed/ReplicatedShardingTest.java      | 2 +-
 .../sharding/external/javadsl/ExternalShardAllocationClient.scala | 2 +-
 .../external/scaladsl/ExternalShardAllocationClient.scala         | 2 +-
 .../cluster/sbr/RandomizedBrainResolverIntegrationSpec.scala      | 2 +-
 .../pekko/cluster/sbr/SplitBrainResolverIntegrationSpec.scala     | 2 +-
 .../scala/org/apache/pekko/cluster/client/ClusterClient.scala     | 4 ++--
 .../pekko/cluster/ddata/typed/javadsl/DistributedData.scala       | 2 +-
 .../pekko/cluster/ddata/typed/scaladsl/DistributedData.scala      | 2 +-
 .../src/main/scala/org/apache/pekko/cluster/typed/Cluster.scala   | 2 +-
 .../pekko/cluster/typed/ActorRefIgnoreSerializationSpec.scala     | 2 +-
 .../main/scala/org/apache/pekko/discovery/ServiceDiscovery.scala  | 4 ++--
 .../scala/org/apache/pekko/cluster/ddata/DistributedData.scala    | 2 +-
 .../test/scala/org/apache/pekko/cluster/ddata/LotsOfDataBot.scala | 2 +-
 docs/src/main/paradox/typed/distributed-data.md                   | 2 +-
 .../main/scala/org/apache/pekko/osgi/ActorSystemActivator.scala   | 2 +-
 osgi/src/main/scala/org/apache/pekko/osgi/DefaultOSGiLogger.scala | 2 +-
 .../main/scala/org/apache/pekko/osgi/OsgiActorSystemFactory.scala | 2 +-
 .../query/javadsl/DurableStateStorePagedPersistenceIdsQuery.scala | 2 +-
 .../persistence/query/javadsl/PagedPersistenceIdsQuery.scala      | 2 +-
 .../scaladsl/DurableStateStorePagedPersistenceIdsQuery.scala      | 2 +-
 .../persistence/query/scaladsl/PagedPersistenceIdsQuery.scala     | 2 +-
 .../testkit/query/scaladsl/PersistenceTestKitReadJournal.scala    | 2 +-
 .../state/scaladsl/PersistenceTestKitDurableStateStore.scala      | 2 +-
 .../src/main/scala/org/apache/pekko/persistence/Persistent.scala  | 4 ----
 .../scala/org/apache/pekko/remote/FailureDetectorRegistry.scala   | 2 +-
 .../scala/org/apache/pekko/remote/artery/EnvelopeBufferPool.scala | 2 +-
 .../scala/org/apache/pekko/remote/artery/RemoteInstrument.scala   | 6 +++---
 .../apache/pekko/remote/artery/tcp/ConfigSSLEngineProvider.scala  | 2 +-
 .../remote/artery/tcp/ssl/RotatingKeysSSLEngineProvider.scala     | 2 +-
 .../scala/org/apache/pekko/remote/transport/PekkoPduCodec.scala   | 4 ++--
 .../apache/pekko/remote/transport/PekkoProtocolTransport.scala    | 8 ++++----
 .../remote/artery/tcp/ssl/RotatingKeysSSLEngineProviderSpec.scala | 4 ++--
 .../pekko/serialization/jackson/JacksonSerializerSpec.scala       | 2 +-
 .../scala/org/apache/pekko/stream/typed/scaladsl/ActorFlow.scala  | 4 ++--
 .../org/apache/pekko/stream/impl/JavaFlowAndRsConverters.scala    | 2 +-
 stream/src/main/scala/org/apache/pekko/stream/FanInShape.scala    | 2 +-
 stream/src/main/scala/org/apache/pekko/stream/FanOutShape.scala   | 2 +-
 stream/src/main/scala/org/apache/pekko/stream/SslTlsOptions.scala | 2 +-
 stream/src/main/scala/org/apache/pekko/stream/impl/package.scala  | 6 +++---
 stream/src/main/scala/org/apache/pekko/stream/javadsl/TLS.scala   | 2 +-
 stream/src/main/scala/org/apache/pekko/stream/scaladsl/Flow.scala | 4 ++--
 .../scala/org/apache/pekko/stream/scaladsl/StreamConverters.scala | 2 +-
 stream/src/main/scala/org/apache/pekko/stream/scaladsl/TLS.scala  | 2 +-
 .../pekko/testkit/metrics/reporter/PekkoConsoleReporter.scala     | 2 +-
 76 files changed, 106 insertions(+), 110 deletions(-)

diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKit.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKit.scala
index 45cd12547c..532bd453e1 100644
--- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKit.scala
+++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKit.scala
@@ -326,7 +326,7 @@ final class ActorTestKit private[pekko] (
    */
   val serializationTestKit: SerializationTestKit = new SerializationTestKit(internalSystem)
 
-  // FIXME needed for Akka internal tests but, users shouldn't spawn system actors?
+  // FIXME needed for Pekko internal tests but, users shouldn't spawn system actors?
   @InternalApi
   private[pekko] def systemActor[T](behavior: Behavior[T], name: String): ActorRef[T] =
     system.systemActorOf(behavior, name)
diff --git a/actor-tests/src/test/scala/org/apache/pekko/serialization/SerializeSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/serialization/SerializeSpec.scala
index 3d0104f097..9213227984 100644
--- a/actor-tests/src/test/scala/org/apache/pekko/serialization/SerializeSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/serialization/SerializeSpec.scala
@@ -327,7 +327,7 @@ class VerifySerializabilitySpec extends PekkoSpec(SerializationTests.verifySeria
 
   }
 
-  "not verify akka creators" in {
+  "not verify pekko creators" in {
     EventFilter.warning(start = "ok", occurrences = 1).intercept {
       // ActorSystem is not possible to serialize, but ok since it starts with "org.apache.pekko."
       val a = system.actorOf(Props(classOf[NonSerializableActor], system))
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorSystem.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorSystem.scala
index ff0fba4001..94e6f1e2e0 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorSystem.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorSystem.scala
@@ -169,7 +169,7 @@ abstract class ActorSystem[-T] extends ActorRef[T] with Extensions with ClassicA
    * Create an actor in the "/system" namespace. This actor will be shut down
    * during system.terminate only after all user actors have terminated.
    *
-   * This is only intended to be used by libraries (and Akka itself).
+   * This is only intended to be used by libraries (and Pekko itself).
    * Applications should use ordinary `spawn`.
    */
   def systemActorOf[U](behavior: Behavior[U], name: String, props: Props = Props.empty): ActorRef[U]
@@ -272,7 +272,7 @@ object ActorSystem {
 
   /**
    * Create an ActorSystem based on the classic [[pekko.actor.ActorSystem]]
-   * which runs Akka Typed [[Behavior]] on an emulation layer. In this
+   * which runs Pekko Typed [[Behavior]] on an emulation layer. In this
    * system typed and classic actors can coexist.
    */
   private def createInternal[T](
@@ -305,7 +305,7 @@ object ActorSystem {
 
   /**
    * Wrap a classic [[pekko.actor.ActorSystem]] such that it can be used from
-   * Akka Typed [[Behavior]].
+   * Pekko Typed [[Behavior]].
    */
   def wrap(system: classic.ActorSystem): ActorSystem[Nothing] =
     ActorSystemAdapter.AdapterExtension(system.asInstanceOf[classic.ActorSystemImpl]).adapter
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/ConsumerController.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/ConsumerController.scala
index b3defdca2a..f2656b783b 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/ConsumerController.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/ConsumerController.scala
@@ -37,7 +37,7 @@ import pekko.util.JavaDurationConverters._
 
 /**
  * `ConsumerController` and [[ProducerController]] or [[WorkPullingProducerController]] are used
- * together. See the descriptions in those classes or the Akka reference documentation for
+ * together. See the descriptions in those classes or the Pekko reference documentation for
  * how they are intended to be used.
  *
  * The destination consumer actor will start the flow by sending an initial [[ConsumerController.Start]]
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ActorContext.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ActorContext.scala
index ca564fdea7..cf507c8d3e 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ActorContext.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ActorContext.scala
@@ -34,7 +34,7 @@ import pekko.pattern.StatusReply
  *  - create a finite number of Actors
  *  - designate the behavior for the next message
  *
- * In Akka the first capability is accessed by using the `tell` method
+ * In Pekko, the first capability is accessed by using the `tell` method
  * on an [[ActorRef]], the second is provided by [[ActorContext#spawn]]
  * and the third is implicit in the signature of [[Behavior]] in that the next
  * behavior is always returned from the message processing logic.
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/ActorContext.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/ActorContext.scala
index ee5847928d..91f046c377 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/ActorContext.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/ActorContext.scala
@@ -35,7 +35,7 @@ import pekko.util.Timeout
  *  - create a finite number of Actors
  *  - designate the behavior for the next message
  *
- * In Akka the first capability is accessed by using the `!` or `tell` method
+ * In Pekko, the first capability is accessed by using the `!` or `tell` method
  * on an [[ActorRef]], the second is provided by [[ActorContext#spawn]]
  * and the third is implicit in the signature of [[Behavior]] in that the next
  * behavior is always returned from the message processing logic.
diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/adapter/package.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/adapter/package.scala
index 2291e9a776..f6e78fb19f 100644
--- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/adapter/package.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/adapter/package.scala
@@ -22,7 +22,7 @@ import pekko.annotation.InternalApi
 /**
  * Adapters between typed and classic actors and actor systems.
  * The underlying `ActorSystem` is the classic [[pekko.actor.ActorSystem]]
- * which runs Akka Typed [[pekko.actor.typed.Behavior]] on an emulation layer. In this
+ * which runs Pekko Typed [[pekko.actor.typed.Behavior]] on an emulation layer. In this
  * system typed and classic actors can coexist.
  *
  * Use these adapters with `import org.apache.pekko.actor.typed.scaladsl.adapter._`.
diff --git a/actor/src/main/scala/org/apache/pekko/NotUsed.scala b/actor/src/main/scala/org/apache/pekko/NotUsed.scala
index 6f597553db..376c5c95b1 100644
--- a/actor/src/main/scala/org/apache/pekko/NotUsed.scala
+++ b/actor/src/main/scala/org/apache/pekko/NotUsed.scala
@@ -16,7 +16,7 @@ package org.apache.pekko
 /**
  * This type is used in generic type signatures wherever the actual value is of no importance.
  * It is a combination of Scala’s `Unit` and Java’s `Void`, which both have different issues when
- * used from the other language. An example use-case is the materialized value of an Pekko Stream for cases
+ * used from the other language. An example use-case is the materialized value of a Pekko Stream for cases
  * where no result shall be returned from materialization.
  */
 sealed abstract class NotUsed
diff --git a/actor/src/main/scala/org/apache/pekko/actor/ActorRef.scala b/actor/src/main/scala/org/apache/pekko/actor/ActorRef.scala
index b6aa55bc65..ff69099fe5 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/ActorRef.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/ActorRef.scala
@@ -448,7 +448,7 @@ private[pekko] class LocalActorRef private[pekko] (
     else rec(this, names)
   }
 
-  // ========= AKKA PROTECTED FUNCTIONS =========
+  // ========= PEKKO PROTECTED FUNCTIONS =========
 
   def underlying: ActorCell = actorCell
 
@@ -984,7 +984,7 @@ private[pekko] class VirtualPathContainer(
   }
 
   override def stop(): Unit = {
-    // The messageHandler function may close over a large object graph (such as an Akka Stream)
+    // The messageHandler function may close over a large object graph (such as a Pekko Stream)
     // so we replace the messageHandler function to make that available for garbage collection.
     // Doesn't matter if the change isn't visible immediately, volatile not needed.
     messageHandler = FunctionRef.deadLetterMessageHandler(system)
diff --git a/actor/src/main/scala/org/apache/pekko/actor/ActorSystem.scala b/actor/src/main/scala/org/apache/pekko/actor/ActorSystem.scala
index 97da4a8099..96482dc78e 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/ActorSystem.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/ActorSystem.scala
@@ -333,7 +333,7 @@ object ActorSystem {
     /**
      * INTERNAL API
      *
-     * When using Akka Typed the Slf4jLogger should be used by default.
+     * When using Pekko Typed the Slf4jLogger should be used by default.
      * Looking for config property `pekko.use-slf4j` (defined in pekko-actor-typed) and
      * that `Slf4jLogger` (pekko-slf4j) is in  classpath.
      * Then adds `Slf4jLogger` to configured loggers and removes `DefaultLogger`.
@@ -377,7 +377,7 @@ object ActorSystem {
   /**
    * Settings are the overall ActorSystem Settings which also provides a convenient access to the Config object.
    *
-   * For more detailed information about the different possible configuration options, look in the Akka Documentation under "Configuration"
+   * For more detailed information about the different possible configuration options, look in the Apache Pekko Documentation under "Configuration"
    *
    * @see <a href="https://lightbend.github.io/config/latest/api/index.html" target="_blank">The Typesafe Config Library API Documentation</a>
    */
@@ -753,7 +753,7 @@ abstract class ExtendedActorSystem extends ActorSystem {
    * Create an actor in the "/system" namespace. This actor will be shut down
    * during system.terminate only after all user actors have terminated.
    *
-   * This is only intended to be used by libraries (and Akka itself).
+   * This is only intended to be used by libraries (and Pekko itself).
    * Applications should use ordinary `actorOf`.
    */
   def systemActorOf(props: Props, name: String): ActorRef
diff --git a/actor/src/main/scala/org/apache/pekko/actor/CoordinatedShutdown.scala b/actor/src/main/scala/org/apache/pekko/actor/CoordinatedShutdown.scala
index af1b4b74c4..2a2db6f634 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/CoordinatedShutdown.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/CoordinatedShutdown.scala
@@ -824,7 +824,7 @@ final class CoordinatedShutdown private[pekko] (
   /**
    * Scala API: Add a JVM shutdown hook that will be run when the JVM process
    * begins its shutdown sequence. Added hooks may run in any order
-   * concurrently, but they are running before Akka internal shutdown
+   * concurrently, but they are running before Pekko internal shutdown
    * hooks, e.g. those shutting down Artery.
    */
   def addJvmShutdownHook[T](hook: => T): Unit = addCancellableJvmShutdownHook(hook)
@@ -832,7 +832,7 @@ final class CoordinatedShutdown private[pekko] (
   /**
    * Scala API: Add a JVM shutdown hook that will be run when the JVM process
    * begins its shutdown sequence. Added hooks may run in any order
-   * concurrently, but they are running before Akka internal shutdown
+   * concurrently, but they are running before Pekko internal shutdown
    * hooks, e.g. those shutting down Artery.
    *
    * The returned ``Cancellable`` makes it possible to de-register the hook. For example
@@ -891,7 +891,7 @@ final class CoordinatedShutdown private[pekko] (
   /**
    * Java API: Add a JVM shutdown hook that will be run when the JVM process
    * begins its shutdown sequence. Added hooks may run in any order
-   * concurrently, but they are running before Akka internal shutdown
+   * concurrently, but they are running before Pekko internal shutdown
    * hooks, e.g. those shutting down Artery.
    */
   def addJvmShutdownHook(hook: Runnable): Unit =
@@ -900,7 +900,7 @@ final class CoordinatedShutdown private[pekko] (
   /**
    * Java API: Add a JVM shutdown hook that will be run when the JVM process
    * begins its shutdown sequence. Added hooks may run in an order
-   * concurrently, but they are running before Akka internal shutdown
+   * concurrently, but they are running before Pekko internal shutdown
    * hooks, e.g. those shutting down Artery.
    *
    * The returned ``Cancellable`` makes it possible to de-register the hook. For example
diff --git a/actor/src/main/scala/org/apache/pekko/actor/Deployer.scala b/actor/src/main/scala/org/apache/pekko/actor/Deployer.scala
index 5cf4be1d3e..326156bb2a 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/Deployer.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/Deployer.scala
@@ -168,7 +168,7 @@ final class Deploy(
  * pattern matching the “scope” (i.e. local/remote/cluster) as well as for
  * extending the information carried by the final Deploy class. Scopes can be
  * used in conjunction with a custom [[pekko.actor.ActorRefProvider]], making
- * Akka actors fully extensible.
+ * Pekko actors fully extensible.
  */
 trait Scope {
 
diff --git a/actor/src/main/scala/org/apache/pekko/actor/DynamicAccess.scala b/actor/src/main/scala/org/apache/pekko/actor/DynamicAccess.scala
index ae19ab0f45..5d085a8adc 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/DynamicAccess.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/DynamicAccess.scala
@@ -26,7 +26,7 @@ import pekko.annotation.DoNotInherit
  * [[pekko.actor.ReflectiveDynamicAccess]] is the default implementation).
  *
  * This is an internal facility and users are not expected to encounter it
- * unless they are extending Akka in ways which go beyond simple Extensions.
+ * unless they are extending Pekko in ways which go beyond simple Extensions.
  *
  * Not for user extension
  */
diff --git a/actor/src/main/scala/org/apache/pekko/actor/Extension.scala b/actor/src/main/scala/org/apache/pekko/actor/Extension.scala
index 5810b61654..e358e48065 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/Extension.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/Extension.scala
@@ -26,7 +26,7 @@ package org.apache.pekko.actor
  * The extension itself can be created in any way desired and has full access
  * to the ActorSystem implementation.
  *
- * This trait is only a marker interface to signify an Akka Extension. This is
+ * This trait is only a marker interface to signify a Pekko Extension. This is
  * how an extension is normally constructed.
  *
  * Scala API:
@@ -115,7 +115,7 @@ trait ExtensionId[T <: Extension] {
   def get(system: ClassicActorSystemProvider): T = apply(system)
 
   /**
-   * Is used by Akka to instantiate the Extension identified by this ExtensionId,
+   * Is used by Pekko to instantiate the Extension identified by this ExtensionId,
    * internal use only.
    */
   def createExtension(system: ExtendedActorSystem): T
diff --git a/actor/src/main/scala/org/apache/pekko/actor/Scheduler.scala b/actor/src/main/scala/org/apache/pekko/actor/Scheduler.scala
index 19ebd9a97c..9c3c01a51f 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/Scheduler.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/Scheduler.scala
@@ -570,7 +570,7 @@ object Scheduler {
   /**
    * If a `TaskRunOnClose` is used in `scheduleOnce` it will be run when the `Scheduler` is
    * closed (`ActorSystem` shutdown). This is needed for the internal shutdown of dispatchers
-   * in Akka and is not intended to be used by end user applications, but it's public because
+   * in Pekko and is not intended to be used by end user applications, but it's public because
    * a custom implementation of `Scheduler` must also implement this.
    */
   trait TaskRunOnClose extends Runnable
diff --git a/actor/src/main/scala/org/apache/pekko/actor/TypedActor.scala b/actor/src/main/scala/org/apache/pekko/actor/TypedActor.scala
index d647cc9274..abb011e35d 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/TypedActor.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/TypedActor.scala
@@ -113,7 +113,7 @@ trait TypedActorFactory {
 }
 
 /**
- * This represents the TypedActor Akka Extension, access to the functionality is done through a given ActorSystem.
+ * This represents the TypedActor Pekko Extension, access to the functionality is done through a given ActorSystem.
  */
 @deprecated("Use 'org.apache.pekko.actor.typed' API.", since = "Akka 2.6.0")
 object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvider {
diff --git a/actor/src/main/scala/org/apache/pekko/dispatch/AbstractDispatcher.scala b/actor/src/main/scala/org/apache/pekko/dispatch/AbstractDispatcher.scala
index 06892ba260..e3e7119a21 100644
--- a/actor/src/main/scala/org/apache/pekko/dispatch/AbstractDispatcher.scala
+++ b/actor/src/main/scala/org/apache/pekko/dispatch/AbstractDispatcher.scala
@@ -266,7 +266,7 @@ abstract class MessageDispatcher(val configurator: MessageDispatcherConfigurator
 
   /**
    * When the dispatcher no longer has any actors registered, how long will it wait until it shuts itself down,
-   * defaulting to your akka configs "pekko.actor.default-dispatcher.shutdown-timeout" or default specified in
+   * defaulting to your pekko configs "pekko.actor.default-dispatcher.shutdown-timeout" or default specified in
    * reference.conf
    *
    * INTERNAL API
diff --git a/actor/src/main/scala/org/apache/pekko/dispatch/Mailbox.scala b/actor/src/main/scala/org/apache/pekko/dispatch/Mailbox.scala
index 389e53284b..9199ac303c 100644
--- a/actor/src/main/scala/org/apache/pekko/dispatch/Mailbox.scala
+++ b/actor/src/main/scala/org/apache/pekko/dispatch/Mailbox.scala
@@ -655,7 +655,7 @@ trait MailboxType {
 trait ProducesMessageQueue[T <: MessageQueue]
 
 /**
- * UnboundedMailbox is the default unbounded MailboxType used by Akka Actors.
+ * UnboundedMailbox is the default unbounded MailboxType used by Pekko Actors.
  */
 final case class UnboundedMailbox() extends MailboxType with ProducesMessageQueue[UnboundedMailbox.MessageQueue] {
 
@@ -707,7 +707,7 @@ case class NonBlockingBoundedMailbox(capacity: Int)
 }
 
 /**
- * BoundedMailbox is the default bounded MailboxType used by Akka Actors.
+ * BoundedMailbox is the default bounded MailboxType used by Pekko Actors.
  */
 final case class BoundedMailbox(capacity: Int, override val pushTimeOut: FiniteDuration)
     extends MailboxType
diff --git a/actor/src/main/scala/org/apache/pekko/io/Dns.scala b/actor/src/main/scala/org/apache/pekko/io/Dns.scala
index 62c310743b..4798a89604 100644
--- a/actor/src/main/scala/org/apache/pekko/io/Dns.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/Dns.scala
@@ -37,7 +37,7 @@ import pekko.util.unused
 /**
  * Not for user extension.
  *
- * This used to be a supported extension point but will be removed in future versions of Akka.
+ * This used to be a supported extension point but will be removed in future versions of Apache Pekko.
  */
 @ccompatUsedUntil213
 @DoNotInherit
diff --git a/actor/src/main/scala/org/apache/pekko/io/DnsProvider.scala b/actor/src/main/scala/org/apache/pekko/io/DnsProvider.scala
index 98d5f50495..03b62459e9 100644
--- a/actor/src/main/scala/org/apache/pekko/io/DnsProvider.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/DnsProvider.scala
@@ -23,7 +23,7 @@ import pekko.actor.Actor
  *
  *  TODO make private and remove deprecated in v1.1.0
  */
-@deprecated("Overriding the DNS implementation will be removed in future versions of Akka", "Akka 2.6.0")
+@deprecated("Overriding the DNS implementation will be removed in future versions of Apache Pekko", "Akka 2.6.0")
 trait DnsProvider {
 
   /**
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/AskSupport.scala b/actor/src/main/scala/org/apache/pekko/pattern/AskSupport.scala
index db13aecd7a..3fb2ad229c 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/AskSupport.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/AskSupport.scala
@@ -507,7 +507,7 @@ final class ExplicitlyAskableActorSelection(val actorSel: ActorSelection) extend
 }
 
 /**
- * Akka private optimized representation of the temporary actor spawned to
+ * Pekko private optimized representation of the temporary actor spawned to
  * receive the reply to an "ask" operation.
  *
  * INTERNAL API
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/CircuitBreaker.scala b/actor/src/main/scala/org/apache/pekko/pattern/CircuitBreaker.scala
index 82072f5bf2..4ea8daaa4d 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/CircuitBreaker.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/CircuitBreaker.scala
@@ -46,7 +46,7 @@ object CircuitBreaker {
    * in Future when using withCircuitBreaker. To use another ExecutionContext for the callbacks you can specify the
    * executor in the constructor.
    *
-   * @param scheduler Reference to Akka scheduler
+   * @param scheduler Reference to Pekko scheduler
    * @param maxFailures Maximum number of failures before opening the circuit
    * @param callTimeout [[scala.concurrent.duration.FiniteDuration]] of time after which to consider a call a failure
    * @param resetTimeout [[scala.concurrent.duration.FiniteDuration]] of time after which to attempt to close the circuit
@@ -74,7 +74,7 @@ object CircuitBreaker {
    * in Future when using withCircuitBreaker. To use another ExecutionContext for the callbacks you can specify the
    * executor in the constructor.
    *
-   * @param scheduler Reference to Akka scheduler
+   * @param scheduler Reference to Pekko scheduler
    * @param maxFailures Maximum number of failures before opening the circuit
    * @param callTimeout [[scala.concurrent.duration.FiniteDuration]] of time after which to consider a call a failure
    * @param resetTimeout [[scala.concurrent.duration.FiniteDuration]] of time after which to attempt to close the circuit
@@ -94,7 +94,7 @@ object CircuitBreaker {
    * in Future when using withCircuitBreaker. To use another ExecutionContext for the callbacks you can specify the
    * executor in the constructor.
    *
-   * @param scheduler Reference to Akka scheduler
+   * @param scheduler Reference to Pekko scheduler
    * @param maxFailures Maximum number of failures before opening the circuit
    * @param callTimeout [[java.time.Duration]] of time after which to consider a call a failure
    * @param resetTimeout [[java.time.Duration]] of time after which to attempt to close the circuit
@@ -138,7 +138,7 @@ object CircuitBreaker {
  * closed state.  If it fails, the circuit breaker will re-open to open state.  All calls beyond the first that
  * execute while the first is running will fail-fast with an exception.
  *
- * @param scheduler Reference to Akka scheduler
+ * @param scheduler Reference to Pekko scheduler
  * @param maxFailures Maximum number of failures before opening the circuit
  * @param callTimeout [[scala.concurrent.duration.FiniteDuration]] of time after which to consider a call a failure
  * @param resetTimeout [[scala.concurrent.duration.FiniteDuration]] of time after which to attempt to close the circuit
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/CircuitBreakersRegistry.scala b/actor/src/main/scala/org/apache/pekko/pattern/CircuitBreakersRegistry.scala
index dc5bd1bd35..58dfd65ef5 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/CircuitBreakersRegistry.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/CircuitBreakersRegistry.scala
@@ -33,7 +33,7 @@ import pekko.util.ccompat.JavaConverters._
 object CircuitBreakersRegistry extends ExtensionId[CircuitBreakersRegistry] with ExtensionIdProvider {
 
   /**
-   * Is used by Akka to instantiate the Extension identified by this ExtensionId,
+   * Is used by Pekko to instantiate the Extension identified by this ExtensionId,
    * internal use only.
    */
   override def createExtension(system: ExtendedActorSystem): CircuitBreakersRegistry =
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/Patterns.scala b/actor/src/main/scala/org/apache/pekko/pattern/Patterns.scala
index e6bc4b84ed..c6e49ff9da 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/Patterns.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/Patterns.scala
@@ -24,7 +24,7 @@ import pekko.util.FutureConverters._
 import pekko.util.JavaDurationConverters._
 
 /**
- * Java API: for Akka patterns such as `ask`, `pipe` and others which work with [[java.util.concurrent.CompletionStage]].
+ * Java API: for Pekko patterns such as `ask`, `pipe` and others which work with [[java.util.concurrent.CompletionStage]].
  */
 object Patterns {
   import scala.concurrent.Future
@@ -645,7 +645,7 @@ object Patterns {
 }
 
 /**
- * Java 8+ API for Akka patterns such as `ask`, `pipe` and others which work with [[java.util.concurrent.CompletionStage]].
+ * Java 8+ API for Pekko patterns such as `ask`, `pipe` and others which work with [[java.util.concurrent.CompletionStage]].
  *
  * For working with Scala [[scala.concurrent.Future]] from Java you may want to use [[pekko.pattern.Patterns]] instead.
  */
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/StatusReply.scala b/actor/src/main/scala/org/apache/pekko/pattern/StatusReply.scala
index d9a1105a93..3b091957fd 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/StatusReply.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/StatusReply.scala
@@ -30,7 +30,7 @@ import pekko.dispatch.ExecutionContexts
  *
  * Create using the factory methods [[StatusReply#success]] and [[StatusReply#error]].
  *
- * Akka contains predefined serializers for the wrapper type and the textual error messages.
+ * Pekko contains predefined serializers for the wrapper type and the textual error messages.
  *
  * @tparam T the type of value a successful reply would have
  */
@@ -100,7 +100,7 @@ object StatusReply {
    * For cases where types are needed to identify errors and behave differently enumerating them with a specific
    * set of response messages may be a better alternative to encoding them as generic exceptions.
    *
-   * Also note that Akka does not contain pre-build serializers for arbitrary exceptions.
+   * Also note that Pekko does not contain pre-build serializers for arbitrary exceptions.
    */
   def error[T](exception: Throwable): StatusReply[T] = Error(exception)
 
@@ -158,7 +158,7 @@ object StatusReply {
      * For cases where types are needed to identify errors and behave differently enumerating them with a specific
      * set of response messages may be a better alternative to encoding them as generic exceptions.
      *
-     * Also note that Akka does not contain pre-build serializers for arbitrary exceptions.
+     * Also note that Pekko does not contain pre-build serializers for arbitrary exceptions.
      */
     def apply[T](exception: Throwable): StatusReply[T] = new StatusReply(ScalaFailure(exception))
     def unapply(status: StatusReply[_]): Option[Throwable] =
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/extended/package.scala b/actor/src/main/scala/org/apache/pekko/pattern/extended/package.scala
index 925b4bb05a..eb53c96056 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/extended/package.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/extended/package.scala
@@ -17,7 +17,7 @@ package pattern
 /**
  * == Extended Versions Of Pekko Patterns ==
  *
- * This subpackage contains extended versions of Akka patterns.
+ * This subpackage contains extended versions of Apache Pekko patterns.
  *
  * Currently supported are:
  *
diff --git a/actor/src/main/scala/org/apache/pekko/serialization/AsyncSerializer.scala b/actor/src/main/scala/org/apache/pekko/serialization/AsyncSerializer.scala
index ff74260ff7..f26d2b3a79 100644
--- a/actor/src/main/scala/org/apache/pekko/serialization/AsyncSerializer.scala
+++ b/actor/src/main/scala/org/apache/pekko/serialization/AsyncSerializer.scala
@@ -25,7 +25,7 @@ import pekko.event.Logging
 /**
  * Serializer that supports async serialization.
  *
- * Only used for Akka persistence journals that explicitly support async serializers.
+ * Only used for Pekko persistence journals that explicitly support async serializers.
  *
  * Implementations should typically extend [[AsyncSerializerWithStringManifest]] or
  * [[AsyncSerializerWithStringManifestCS]] that delegates synchronous calls to their async equivalents.
@@ -64,7 +64,7 @@ abstract class AsyncSerializerWithStringManifest(system: ExtendedActorSystem)
 
   final override def fromBinary(bytes: Array[Byte], manifest: String): AnyRef = {
     log.warning(
-      "Async serializer called synchronously. This will block. Async serializers should only be used for akka persistence plugins that support them. Manifest: [{}]",
+      "Async serializer called synchronously. This will block. Async serializers should only be used for Pekko persistence plugins that support them. Manifest: [{}]",
       manifest)
     Await.result(fromBinaryAsync(bytes, manifest), Duration.Inf)
   }
diff --git a/actor/src/main/scala/org/apache/pekko/serialization/Serialization.scala b/actor/src/main/scala/org/apache/pekko/serialization/Serialization.scala
index f09d3b8f9c..822a16ed8a 100644
--- a/actor/src/main/scala/org/apache/pekko/serialization/Serialization.scala
+++ b/actor/src/main/scala/org/apache/pekko/serialization/Serialization.scala
@@ -106,7 +106,7 @@ object Serialization {
    * in Jackson need access to the current `ActorSystem`. The current [[Information]] can be accessed within
    * `f` via [[Serialization#getCurrentTransportInformation]].
    *
-   * Akka Remoting sets this value when serializing and deserializing messages, and when using
+   * Pekko Remoting sets this value when serializing and deserializing messages, and when using
    * the ordinary `serialize` and `deserialize` methods in [[Serialization]] the value is also
    * set automatically.
    *
diff --git a/actor/src/main/scala/org/apache/pekko/serialization/SerializationExtension.scala b/actor/src/main/scala/org/apache/pekko/serialization/SerializationExtension.scala
index 52933dad80..28833ff315 100644
--- a/actor/src/main/scala/org/apache/pekko/serialization/SerializationExtension.scala
+++ b/actor/src/main/scala/org/apache/pekko/serialization/SerializationExtension.scala
@@ -18,7 +18,7 @@ import pekko.actor.{ ActorSystem, ExtendedActorSystem, ExtensionId, ExtensionIdP
 import pekko.actor.ClassicActorSystemProvider
 
 /**
- * SerializationExtension is an Akka Extension to interact with the Serialization
+ * SerializationExtension is a Pekko Extension to interact with the Serialization
  * that is built into Akka
  */
 object SerializationExtension extends ExtensionId[Serialization] with ExtensionIdProvider {
diff --git a/actor/src/main/scala/org/apache/pekko/serialization/Serializer.scala b/actor/src/main/scala/org/apache/pekko/serialization/Serializer.scala
index 325970e1d6..5143785953 100644
--- a/actor/src/main/scala/org/apache/pekko/serialization/Serializer.scala
+++ b/actor/src/main/scala/org/apache/pekko/serialization/Serializer.scala
@@ -53,7 +53,7 @@ trait Serializer {
 
   /**
    * Completely unique value to identify this implementation of Serializer, used to optimize network traffic.
-   * Values from 0 to 40 are reserved for Akka internal usage.
+   * Values from 0 to 40 are reserved for Pekko internal usage.
    */
   def identifier: Int
 
@@ -129,7 +129,7 @@ abstract class SerializerWithStringManifest extends Serializer {
 
   /**
    * Completely unique value to identify this implementation of Serializer, used to optimize network traffic.
-   * Values from 0 to 40 are reserved for Akka internal usage.
+   * Values from 0 to 40 are reserved for Pekko internal usage.
    */
   def identifier: Int
 
diff --git a/bench-jmh/README.md b/bench-jmh/README.md
index 00a9aabf13..81be2c585a 100644
--- a/bench-jmh/README.md
+++ b/bench-jmh/README.md
@@ -1,6 +1,6 @@
 # Apache Pekko Microbenchmarks
 
-This subproject contains some microbenchmarks excercising key parts of Akka. (Excluding typed which has its 
+This subproject contains some microbenchmarks excercising key parts of Apache Pekko. (Excluding typed which has its 
 own jmh module)
 
 
diff --git a/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/ShardingConsumerController.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/ShardingConsumerController.scala
index 188aad71a9..7f38e237ba 100644
--- a/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/ShardingConsumerController.scala
+++ b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/ShardingConsumerController.scala
@@ -28,7 +28,7 @@ import pekko.cluster.sharding.typed.delivery.internal.ShardingConsumerController
 
 /**
  * `ShardingConsumerController` is used together with [[ShardingProducerController]]. See the description
- * in that class or the Akka reference documentation for how they are intended to be used.
+ * in that class or the Pekko reference documentation for how they are intended to be used.
  *
  * `ShardingConsumerController` is the entity that is initialized in `ClusterSharding`. It will manage
  * the lifecycle and message delivery to the destination consumer actor.
diff --git a/cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingTest.java b/cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingTest.java
index c1d9b974e6..2dcec1460c 100644
--- a/cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingTest.java
+++ b/cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingTest.java
@@ -175,7 +175,7 @@ public class ReplicatedShardingTest extends JUnitSuite {
                                   // factory for the entity for a given entity in that replica
                                   MyReplicatedStringSet.create(
                                       ReplicationId.fromString(entityContext.getEntityId())))
-                          // potentially use replica id as role or dc in Akka multi dc for the
+                          // potentially use replica id as role or dc in Pekko multi dc for the
                           // sharding instance
                           // to control where replicas will live
                           // .withDataCenter(replicaId.id()))
diff --git a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/javadsl/ExternalShardAllocationClient.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/javadsl/ExternalShardAllocationClient.scala
index 2a2eb69c49..71bff32c05 100644
--- a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/javadsl/ExternalShardAllocationClient.scala
+++ b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/javadsl/ExternalShardAllocationClient.scala
@@ -37,7 +37,7 @@ trait ExternalShardAllocationClient {
    * sharding rebalance.
    *
    * @param shard    The shard identifier
-   * @param location Location (akka node) to allocate the shard to
+   * @param location Location (Pekko node) to allocate the shard to
    * @return Conformation that the update has been written to the local node
    */
   def setShardLocation(shard: ShardId, location: Address): CompletionStage[Done]
diff --git a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/scaladsl/ExternalShardAllocationClient.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/scaladsl/ExternalShardAllocationClient.scala
index 9a71412075..813da2bf28 100644
--- a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/scaladsl/ExternalShardAllocationClient.scala
+++ b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/scaladsl/ExternalShardAllocationClient.scala
@@ -37,7 +37,7 @@ trait ExternalShardAllocationClient {
    * sharding rebalance it does.
    *
    * @param shard The shard identifier
-   * @param location Location (akka node) to allocate the shard to
+   * @param location Location (Pekko node) to allocate the shard to
    * @return Confirmation that the update has been propagated to a majority of cluster nodes
    */
   def updateShardLocation(shard: ShardId, location: Address): Future[Done]
diff --git a/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/RandomizedBrainResolverIntegrationSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/RandomizedBrainResolverIntegrationSpec.scala
index f1c7efd74c..51091ee6c0 100644
--- a/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/RandomizedBrainResolverIntegrationSpec.scala
+++ b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/RandomizedBrainResolverIntegrationSpec.scala
@@ -41,7 +41,7 @@ import pekko.testkit.TestProbe
 import pekko.util.Timeout
 
 /*
- * Depends on akka private classes so needs to be in this package
+ * Depends on Pekko private classes so needs to be in this package
  */
 object RandomizedSplitBrainResolverIntegrationSpec extends MultiNodeConfig {
   val node1 = role("node1")
diff --git a/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverIntegrationSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverIntegrationSpec.scala
index 197186821e..5843533e4e 100644
--- a/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverIntegrationSpec.scala
+++ b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverIntegrationSpec.scala
@@ -44,7 +44,7 @@ import pekko.testkit.TestProbe
 import pekko.util.Timeout
 
 /*
- * Depends on akka private classes so needs to be in this package
+ * Depends on Pekko private classes so needs to be in this package
  */
 object SplitBrainResolverIntegrationSpec extends MultiNodeConfig {
   val node1 = role("node1")
diff --git a/cluster-tools/src/main/scala/org/apache/pekko/cluster/client/ClusterClient.scala b/cluster-tools/src/main/scala/org/apache/pekko/cluster/client/ClusterClient.scala
index 5df02bb25c..e7e4684caa 100644
--- a/cluster-tools/src/main/scala/org/apache/pekko/cluster/client/ClusterClient.scala
+++ b/cluster-tools/src/main/scala/org/apache/pekko/cluster/client/ClusterClient.scala
@@ -803,13 +803,13 @@ sealed trait ClusterClientInteraction {
 }
 
 /**
- * Emitted to the Akka event stream when a cluster client has interacted with
+ * Emitted to the Pekko event stream when a cluster client has interacted with
  * a receptionist.
  */
 final case class ClusterClientUp(override val clusterClient: ActorRef) extends ClusterClientInteraction
 
 /**
- * Emitted to the Akka event stream when a cluster client was previously connected
+ * Emitted to the Pekko event stream when a cluster client was previously connected
  * but then not seen for some time.
  */
 final case class ClusterClientUnreachable(override val clusterClient: ActorRef) extends ClusterClientInteraction
diff --git a/cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/DistributedData.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/DistributedData.scala
index d6df96c8d5..35a0037684 100644
--- a/cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/DistributedData.scala
+++ b/cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/DistributedData.scala
@@ -69,7 +69,7 @@ object DistributedData extends ExtensionId[DistributedData] {
 }
 
 /**
- * Akka extension for convenient configuration and use of the
+ * Pekko extension for convenient configuration and use of the
  * [[Replicator]]. Configuration settings are defined in the
  * `pekko.cluster.ddata` section, see `reference.conf`.
  *
diff --git a/cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/DistributedData.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/DistributedData.scala
index a3342ad794..d35bba669b 100644
--- a/cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/DistributedData.scala
+++ b/cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/DistributedData.scala
@@ -68,7 +68,7 @@ object DistributedData extends ExtensionId[DistributedData] {
 }
 
 /**
- * Akka extension for convenient configuration and use of the
+ * Pekko extension for convenient configuration and use of the
  * [[Replicator]]. Configuration settings are defined in the
  * `pekko.cluster.ddata` section, see `reference.conf`.
  *
diff --git a/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/Cluster.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/Cluster.scala
index 4996cdb698..1ea1a6104d 100644
--- a/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/Cluster.scala
+++ b/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/Cluster.scala
@@ -181,7 +181,7 @@ case object PrepareForFullClusterShutdown extends PrepareForFullClusterShutdown
 }
 
 /**
- * Akka Typed Cluster API entry point
+ * Pekko Typed Cluster API entry point
  */
 object Cluster extends ExtensionId[Cluster] {
 
diff --git a/cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ActorRefIgnoreSerializationSpec.scala b/cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ActorRefIgnoreSerializationSpec.scala
index 0052d190d8..2133805609 100644
--- a/cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ActorRefIgnoreSerializationSpec.scala
+++ b/cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ActorRefIgnoreSerializationSpec.scala
@@ -94,7 +94,7 @@ class ActorRefIgnoreSerializationSpec extends AnyWordSpec with ScalaFutures with
 
   "IgnoreActorRef (in classic)" should {
 
-    "return a serializable ActorRef that can be sent between two ActorSystems using remote (akka classic)" in {
+    "return a serializable ActorRef that can be sent between two ActorSystems using remote (pekko classic)" in {
 
       val ignoreRef = system1.ignoreRef[String].toClassic
       val remoteRefStr = ignoreRef.path.toSerializationFormatWithAddress(system1.address)
diff --git a/discovery/src/main/scala/org/apache/pekko/discovery/ServiceDiscovery.scala b/discovery/src/main/scala/org/apache/pekko/discovery/ServiceDiscovery.scala
index 5184fc1ce1..1d43a1d9d6 100644
--- a/discovery/src/main/scala/org/apache/pekko/discovery/ServiceDiscovery.scala
+++ b/discovery/src/main/scala/org/apache/pekko/discovery/ServiceDiscovery.scala
@@ -139,7 +139,7 @@ object ServiceDiscovery {
  * A service lookup. It is up to each method to decide
  * what to do with the optional portName and protocol fields.
  * For example `portName` could be used to distinguish between
- * Akka remoting ports and HTTP ports.
+ * Apache Pekko remoting ports and HTTP ports.
  *
  * @param serviceName must not be 'null' or an empty String
  */
@@ -150,7 +150,7 @@ final class Lookup(val serviceName: String, val portName: Option[String], val pr
   require(serviceName.trim.nonEmpty, "'serviceName' cannot be empty")
 
   /**
-   * Which port for a service e.g. Akka remoting or HTTP.
+   * Which port for a service e.g. Apache Pekko remoting or HTTP.
    * Maps to "service" for an SRV records.
    */
   def withPortName(value: String): Lookup = copy(portName = Some(value))
diff --git a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DistributedData.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DistributedData.scala
index f9f8ba83b9..43932ce66d 100644
--- a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DistributedData.scala
+++ b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DistributedData.scala
@@ -35,7 +35,7 @@ object DistributedData extends ExtensionId[DistributedData] with ExtensionIdProv
 }
 
 /**
- * Akka extension for convenient configuration and use of the
+ * Pekko extension for convenient configuration and use of the
  * [[Replicator]]. Configuration settings are defined in the
  * `pekko.cluster.ddata` section, see `reference.conf`.
  */
diff --git a/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LotsOfDataBot.scala b/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LotsOfDataBot.scala
index c8b2b7136b..c20fb46f88 100644
--- a/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LotsOfDataBot.scala
+++ b/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LotsOfDataBot.scala
@@ -65,7 +65,7 @@ object LotsOfDataBot {
             }
             """)))
 
-      // Create an Akka system
+      // Create a Pekko system
       val system = ActorSystem("ClusterSystem", config)
       // Create an actor that handles cluster domain events
       system.actorOf(Props[LotsOfDataBot](), name = "dataBot")
diff --git a/docs/src/main/paradox/typed/distributed-data.md b/docs/src/main/paradox/typed/distributed-data.md
index 20a66d2682..c22b7c227b 100644
--- a/docs/src/main/paradox/typed/distributed-data.md
+++ b/docs/src/main/paradox/typed/distributed-data.md
@@ -1,5 +1,5 @@
 ---
-project.description: Share data between nodes and perform updates without coordination in a Apache Pekko Cluster using Conflict Free Replicated Data Types CRDT.
+project.description: Share data between nodes and perform updates without coordination in an Apache Pekko Cluster using Conflict Free Replicated Data Types CRDT.
 ---
 # Distributed Data
 
diff --git a/osgi/src/main/scala/org/apache/pekko/osgi/ActorSystemActivator.scala b/osgi/src/main/scala/org/apache/pekko/osgi/ActorSystemActivator.scala
index d41baf2b74..d8ff04ac63 100644
--- a/osgi/src/main/scala/org/apache/pekko/osgi/ActorSystemActivator.scala
+++ b/osgi/src/main/scala/org/apache/pekko/osgi/ActorSystemActivator.scala
@@ -134,7 +134,7 @@ abstract class ActorSystemActivator extends BundleActivator {
    * Override this method to define a configuration for your [[pekko.actor.ActorSystem]] instance.
    * This configuration will be merged with fallback on
    *    the application.conf of your bundle
-   *    the reference.conf of the akka bundles
+   *    the reference.conf of the Pekko bundles
    *    the System properties.
    *
    * @param context the bundle context
diff --git a/osgi/src/main/scala/org/apache/pekko/osgi/DefaultOSGiLogger.scala b/osgi/src/main/scala/org/apache/pekko/osgi/DefaultOSGiLogger.scala
index eadb5b5a2f..63c819512f 100644
--- a/osgi/src/main/scala/org/apache/pekko/osgi/DefaultOSGiLogger.scala
+++ b/osgi/src/main/scala/org/apache/pekko/osgi/DefaultOSGiLogger.scala
@@ -22,7 +22,7 @@ import pekko.event.Logging.Error.NoCause
 
 /**
  * Logger for OSGi environment.
- * Stands for an interface between akka and the OSGi LogService
+ * Stands for an interface between Pekko and the OSGi LogService
  * It uses the OSGi LogService to log the received LogEvents
  */
 class DefaultOSGiLogger extends DefaultLogger {
diff --git a/osgi/src/main/scala/org/apache/pekko/osgi/OsgiActorSystemFactory.scala b/osgi/src/main/scala/org/apache/pekko/osgi/OsgiActorSystemFactory.scala
index a2de76af3d..7be30e4493 100644
--- a/osgi/src/main/scala/org/apache/pekko/osgi/OsgiActorSystemFactory.scala
+++ b/osgi/src/main/scala/org/apache/pekko/osgi/OsgiActorSystemFactory.scala
@@ -76,7 +76,7 @@ object OsgiActorSystemFactory {
   def pekkoActorClassLoader = classOf[ActorSystemActivator].getClassLoader
 
   /*
-   * Create an [[OsgiActorSystemFactory]] instance to set up Akka in an OSGi environment
+   * Create an [[OsgiActorSystemFactory]] instance to set up Pekko in an OSGi environment
    */
   def apply(context: BundleContext, config: Config): OsgiActorSystemFactory =
     new OsgiActorSystemFactory(context, Some(pekkoActorClassLoader), config)
diff --git a/persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/DurableStateStorePagedPersistenceIdsQuery.scala b/persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/DurableStateStorePagedPersistenceIdsQuery.scala
index 5dde9b366c..b08419d135 100644
--- a/persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/DurableStateStorePagedPersistenceIdsQuery.scala
+++ b/persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/DurableStateStorePagedPersistenceIdsQuery.scala
@@ -28,7 +28,7 @@ trait DurableStateStorePagedPersistenceIdsQuery[A] extends DurableStateStore[A]
   /**
    * Get the current persistence ids.
    *
-   * Not all plugins may support in database paging, and may simply use drop/take Akka streams operators
+   * Not all plugins may support in database paging, and may simply use drop/take Pekko streams operators
    * to manipulate the result set according to the paging parameters.
    *
    * @param afterId The ID to start returning results from, or empty to return all ids. This should be an id returned
diff --git a/persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/PagedPersistenceIdsQuery.scala b/persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/PagedPersistenceIdsQuery.scala
index bf517bc186..46d62b3e7f 100644
--- a/persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/PagedPersistenceIdsQuery.scala
+++ b/persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/PagedPersistenceIdsQuery.scala
@@ -27,7 +27,7 @@ trait PagedPersistenceIdsQuery extends ReadJournal {
   /**
    * Get the current persistence ids.
    *
-   * Not all plugins may support in database paging, and may simply use drop/take Akka streams operators
+   * Not all plugins may support in database paging, and may simply use drop/take Pekko streams operators
    * to manipulate the result set according to the paging parameters.
    *
    * @param afterId The ID to start returning results from, or empty to return all ids. This should be an id returned
diff --git a/persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/DurableStateStorePagedPersistenceIdsQuery.scala b/persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/DurableStateStorePagedPersistenceIdsQuery.scala
index 6349573f8f..1e9c3f7088 100644
--- a/persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/DurableStateStorePagedPersistenceIdsQuery.scala
+++ b/persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/DurableStateStorePagedPersistenceIdsQuery.scala
@@ -26,7 +26,7 @@ trait DurableStateStorePagedPersistenceIdsQuery[A] extends DurableStateStore[A]
   /**
    * Get the current persistence ids.
    *
-   * Not all plugins may support in database paging, and may simply use drop/take Akka streams operators
+   * Not all plugins may support in database paging, and may simply use drop/take Pekko streams operators
    * to manipulate the result set according to the paging parameters.
    *
    * @param afterId The ID to start returning results from, or [[None]] to return all ids. This should be an id
diff --git a/persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/PagedPersistenceIdsQuery.scala b/persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/PagedPersistenceIdsQuery.scala
index cf655f1552..784c8a0996 100644
--- a/persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/PagedPersistenceIdsQuery.scala
+++ b/persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/PagedPersistenceIdsQuery.scala
@@ -25,7 +25,7 @@ trait PagedPersistenceIdsQuery extends ReadJournal {
   /**
    * Get the current persistence ids.
    *
-   * Not all plugins may support in database paging, and may simply use drop/take Akka streams operators
+   * Not all plugins may support in database paging, and may simply use drop/take Pekko streams operators
    * to manipulate the result set according to the paging parameters.
    *
    * @param afterId The ID to start returning results from, or [[None]] to return all ids. This should be an id
diff --git a/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/query/scaladsl/PersistenceTestKitReadJournal.scala b/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/query/scaladsl/PersistenceTestKitReadJournal.scala
index efc305daa9..887943c5f1 100644
--- a/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/query/scaladsl/PersistenceTestKitReadJournal.scala
+++ b/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/query/scaladsl/PersistenceTestKitReadJournal.scala
@@ -146,7 +146,7 @@ final class PersistenceTestKitReadJournal(system: ExtendedActorSystem, @unused c
   /**
    * Get the current persistence ids.
    *
-   * Not all plugins may support in database paging, and may simply use drop/take Akka streams operators
+   * Not all plugins may support in database paging, and may simply use drop/take Pekko streams operators
    * to manipulate the result set according to the paging parameters.
    *
    * @param afterId The ID to start returning results from, or [[None]] to return all ids. This should be an id
diff --git a/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStore.scala b/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStore.scala
index 50adcd56db..dbf78d7c21 100644
--- a/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStore.scala
+++ b/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStore.scala
@@ -200,7 +200,7 @@ class PersistenceTestKitDurableStateStore[A](val system: ExtendedActorSystem)
         case None     => allKeys
       }
 
-      // Enforce limit in Akka Streams so that we can pass long values to take as is.
+      // Enforce limit in Pekko Streams so that we can pass long values to take as is.
       Source(keys).take(limit)
     }
 
diff --git a/persistence/src/main/scala/org/apache/pekko/persistence/Persistent.scala b/persistence/src/main/scala/org/apache/pekko/persistence/Persistent.scala
index bcd99a559b..e67cf3d8b5 100644
--- a/persistence/src/main/scala/org/apache/pekko/persistence/Persistent.scala
+++ b/persistence/src/main/scala/org/apache/pekko/persistence/Persistent.scala
@@ -135,10 +135,6 @@ final case class AtomicWrite(payload: immutable.Seq[PersistentRepr]) extends Per
 
   /**
    * Not used, can always be `false`.
-   *
-   * Not used in new records stored with Akka v2.4, but
-   * old records from v2.3 may have this as `true` if
-   * it was a non-permanent delete.
    */
   def deleted: Boolean // FIXME deprecate, issue #27278
 
diff --git a/remote/src/main/scala/org/apache/pekko/remote/FailureDetectorRegistry.scala b/remote/src/main/scala/org/apache/pekko/remote/FailureDetectorRegistry.scala
index 16b5efd60a..2cda3b5187 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/FailureDetectorRegistry.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/FailureDetectorRegistry.scala
@@ -21,7 +21,7 @@ import pekko.actor.{ ActorContext, ActorSystem, ExtendedActorSystem }
 import pekko.event.EventStream
 
 /**
- * Interface for a registry of Akka failure detectors. New resources are implicitly registered when heartbeat is first
+ * Interface for a registry of Pekko failure detectors. New resources are implicitly registered when heartbeat is first
  * called with the resource given as parameter.
  *
  * type parameter A:
diff --git a/remote/src/main/scala/org/apache/pekko/remote/artery/EnvelopeBufferPool.scala b/remote/src/main/scala/org/apache/pekko/remote/artery/EnvelopeBufferPool.scala
index 3abcf5ffff..9193b6babc 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/artery/EnvelopeBufferPool.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/artery/EnvelopeBufferPool.scala
@@ -75,7 +75,7 @@ private[remote] object ByteFlag {
  *
  * The strategy if the header format must be changed in an incompatible way is:
  * - In the end we only want to support one header format, the latest, but during
- *   a rolling upgrade period we must support two versions in at least one Akka patch
+ *   a rolling upgrade period we must support two versions in at least one Pekko patch
  *   release.
  * - When supporting two version the outbound messages must still be encoded with old
  *   version. The Decoder on the receiving side must understand both versions.
diff --git a/remote/src/main/scala/org/apache/pekko/remote/artery/RemoteInstrument.scala b/remote/src/main/scala/org/apache/pekko/remote/artery/RemoteInstrument.scala
index 5ca501a930..617ec60a13 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/artery/RemoteInstrument.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/artery/RemoteInstrument.scala
@@ -53,7 +53,7 @@ abstract class RemoteInstrument {
    *
    * MUST be >=1 and <32.
    *
-   * Values between 1 and 7 are reserved for Akka internal use.
+   * Values between 1 and 7 are reserved for Pekko internal use.
    */
   def identifier: Byte
 
@@ -72,7 +72,7 @@ abstract class RemoteInstrument {
    * Called right before putting the message onto the wire.
    * Parameters MAY be `null` (except `message` and `buffer`)!
    *
-   * The `size` is the total serialized size in bytes of the complete message including akka specific headers and any
+   * The `size` is the total serialized size in bytes of the complete message including Pekko specific headers and any
    * `RemoteInstrument` metadata.
    * If `serializationTimingEnabled` returns true, then `time` will be the total time it took to serialize all data
    * in the message in nanoseconds, otherwise it is 0.
@@ -87,7 +87,7 @@ abstract class RemoteInstrument {
   /**
    * Called when the message has been deserialized.
    *
-   * The `size` is the total serialized size in bytes of the complete message including akka specific headers and any
+   * The `size` is the total serialized size in bytes of the complete message including Pekko specific headers and any
    * `RemoteInstrument` metadata.
    * If `serializationTimingEnabled` returns true, then `time` will be the total time it took to deserialize all data
    * in the message in nanoseconds, otherwise it is 0.
diff --git a/remote/src/main/scala/org/apache/pekko/remote/artery/tcp/ConfigSSLEngineProvider.scala b/remote/src/main/scala/org/apache/pekko/remote/artery/tcp/ConfigSSLEngineProvider.scala
index 86e1673655..2b99d9f52a 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/artery/tcp/ConfigSSLEngineProvider.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/artery/tcp/ConfigSSLEngineProvider.scala
@@ -72,7 +72,7 @@ class ConfigSSLEngineProvider(protected val config: Config, protected val log: M
     else
       log.info(
         LogMarker.Security,
-        "TLS/SSL hostname verification is disabled. See Akka reference documentation for more information.")
+        "TLS/SSL hostname verification is disabled. See Pekko reference documentation for more information.")
 
     constructContext()
   }
diff --git a/remote/src/main/scala/org/apache/pekko/remote/artery/tcp/ssl/RotatingKeysSSLEngineProvider.scala b/remote/src/main/scala/org/apache/pekko/remote/artery/tcp/ssl/RotatingKeysSSLEngineProvider.scala
index e6198df54b..bbf87ae2c1 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/artery/tcp/ssl/RotatingKeysSSLEngineProvider.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/artery/tcp/ssl/RotatingKeysSSLEngineProvider.scala
@@ -48,7 +48,7 @@ import scala.concurrent.duration._
  *
  * This class is still ApiMayChange because it can likely be further harmonized with
  * the standard ConfigSSLEngineProvider. Also the location and default values of the
- * configuration may change in future versions of Akka.
+ * configuration may change in future versions of Apache Pekko.
  *
  * This provider does not perform hostname verification, but instead allows checking
  * that the remote certificate has a subject name that matches the subject name of
diff --git a/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoPduCodec.scala b/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoPduCodec.scala
index bbaac95789..581ebc1c42 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoPduCodec.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoPduCodec.scala
@@ -75,14 +75,14 @@ private[remote] trait PekkoPduCodec {
    * ByteString.
    *
    * @param raw
-   *   Encoded raw byte representation of an Pekko PDU
+   *   Encoded raw byte representation of a Pekko PDU
    * @return
    *   Case class representation of the decoded PDU that can be used in a match statement
    */
   def decodePdu(raw: ByteString): PekkoPdu
 
   /**
-   * Takes an [[pekko.remote.transport.PekkoPduCodec.PekkoPdu]] representation of an Pekko PDU and returns its encoded
+   * Takes an [[pekko.remote.transport.PekkoPduCodec.PekkoPdu]] representation of a Pekko PDU and returns its encoded
    * form as a [[pekko.util.ByteString]].
    *
    * For the same effect the constructXXX methods might be called directly, taking method parameters instead of the
diff --git a/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoProtocolTransport.scala b/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoProtocolTransport.scala
index ba0e15feb3..5aadc4e28a 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoProtocolTransport.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoProtocolTransport.scala
@@ -93,7 +93,7 @@ object HandshakeInfo {
 final case class HandshakeInfo(origin: Address, uid: Int, cookie: Option[String])
 
 /**
- * Implementation of the Akka protocol as a Transport that wraps an underlying Transport instance.
+ * Implementation of the Pekko protocol as a Transport that wraps an underlying Transport instance.
  *
  * Features provided by this transport are:
  *  - Soft-state associations via the use of heartbeats and failure detectors
@@ -110,7 +110,7 @@ final case class HandshakeInfo(origin: Address, uid: Int, cookie: Option[String]
  * @param system
  *   the actor system
  * @param settings
- *   the configuration options of the Akka protocol
+ *   the configuration options of the Pekko protocol
  * @param codec
  *   the codec that will be used to encode/decode Pekko PDUs
  */
@@ -282,13 +282,13 @@ private[remote] object ProtocolStateActor {
       transport: Transport)
       extends InitialProtocolStateData
 
-  // The underlying transport is associated, but the handshake of the akka protocol is not yet finished
+  // The underlying transport is associated, but the handshake of the Pekko protocol is not yet finished
   final case class OutboundUnderlyingAssociated(
       statusPromise: Promise[AssociationHandle],
       wrappedHandle: AssociationHandle)
       extends ProtocolStateData
 
-  // The underlying transport is associated, but the handshake of the akka protocol is not yet finished
+  // The underlying transport is associated, but the handshake of the Pekko protocol is not yet finished
   final case class InboundUnassociated(associationListener: AssociationEventListener, wrappedHandle: AssociationHandle)
       extends InitialProtocolStateData
 
diff --git a/remote/src/test/scala/org/apache/pekko/remote/artery/tcp/ssl/RotatingKeysSSLEngineProviderSpec.scala b/remote/src/test/scala/org/apache/pekko/remote/artery/tcp/ssl/RotatingKeysSSLEngineProviderSpec.scala
index ef437b9db4..6afdbb7021 100644
--- a/remote/src/test/scala/org/apache/pekko/remote/artery/tcp/ssl/RotatingKeysSSLEngineProviderSpec.scala
+++ b/remote/src/test/scala/org/apache/pekko/remote/artery/tcp/ssl/RotatingKeysSSLEngineProviderSpec.scala
@@ -137,7 +137,7 @@ class RotatingProviderWithChangingKeysSpec
       val (_, pathEchoC) = buildRemoteWithEchoActor("C-reread")
       try {
         contact(remoteSysB.actorSystem, pathEchoC)
-        fail("The credentials under `ssl/rsa-client` are not valid for Akka remote so contact() must fail.")
+        fail("The credentials under `ssl/rsa-client` are not valid for Pekko remote so contact() must fail.")
       } catch {
         case _: java.lang.AssertionError =>
         // This assertion error is expected because we expect a failure in contact() since
@@ -227,7 +227,7 @@ object RotatingKeysSSLEngineProviderSpec {
 }
 
 // Superclass to integration tests to test key rotation. Basic happy-path
-// integration tests of `RotatingKeysSSLEngineProvider` as an SSLEngineProvider for Akka Remote
+// integration tests of `RotatingKeysSSLEngineProvider` as an SSLEngineProvider for Pekko Remote
 // are in `TlsTcpWithRotatingKeysSSLEngineSpec`
 abstract class RotatingKeysSSLEngineProviderSpec(extraConfig: String)
     extends ArteryMultiNodeSpec(ConfigFactory.parseString(extraConfig).withFallback(TlsTcpSpec.config))
diff --git a/serialization-jackson/src/test/scala/org/apache/pekko/serialization/jackson/JacksonSerializerSpec.scala b/serialization-jackson/src/test/scala/org/apache/pekko/serialization/jackson/JacksonSerializerSpec.scala
index 5cb17973a8..f070432785 100644
--- a/serialization-jackson/src/test/scala/org/apache/pekko/serialization/jackson/JacksonSerializerSpec.scala
+++ b/serialization-jackson/src/test/scala/org/apache/pekko/serialization/jackson/JacksonSerializerSpec.scala
@@ -330,7 +330,7 @@ class JacksonJsonSerializerSpec extends JacksonSerializerSpec("jackson-json") {
 
         "fallback to defaults when object mapper is not configured" in {
           val notConfigured = JacksonObjectMapperProvider(sys).getOrCreate("jackson-not-configured", None)
-          // Use Jacksons and Akka defaults
+          // Use Jacksons and Pekko defaults
           notConfigured.isEnabled(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS) should ===(false)
           notConfigured.isEnabled(DeserializationFeature.EAGER_DESERIALIZER_FETCH) should ===(true)
           notConfigured.isEnabled(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY) should ===(false)
diff --git a/stream-typed/src/main/scala/org/apache/pekko/stream/typed/scaladsl/ActorFlow.scala b/stream-typed/src/main/scala/org/apache/pekko/stream/typed/scaladsl/ActorFlow.scala
index d22a49f6f3..de09031b98 100644
--- a/stream-typed/src/main/scala/org/apache/pekko/stream/typed/scaladsl/ActorFlow.scala
+++ b/stream-typed/src/main/scala/org/apache/pekko/stream/typed/scaladsl/ActorFlow.scala
@@ -42,13 +42,13 @@ object ActorFlow {
       .mapAsync(parallelism) { el =>
         val res = pekko.pattern.extended.ask(classicRef, (replyTo: pekko.actor.ActorRef) => makeMessage(el, replyTo))
         // we need to cast manually (yet safely, by construction!) since otherwise we need a ClassTag,
-        // which in Scala is fine, but then we would force JavaDSL to create one, which is a hassle in the Akka Typed DSL,
+        // which in Scala is fine, but then we would force JavaDSL to create one, which is a hassle in the Apache Pekko Typed DSL,
         // since one may say "but I already specified the type!", and that we have to go via the classic ask is an implementation detail
         makeOut(el, res.asInstanceOf[Future[A]])
       }
       .mapError {
         case ex: AskTimeoutException =>
-          // in Akka Typed we use the `TimeoutException` everywhere
+          // in Apache Pekko Typed we use the `TimeoutException` everywhere
           new java.util.concurrent.TimeoutException(ex.getMessage)
 
         // the purpose of this recovery is to change the name of the stage in that exception
diff --git a/stream/src/main/scala-jdk-9/org/apache/pekko/stream/impl/JavaFlowAndRsConverters.scala b/stream/src/main/scala-jdk-9/org/apache/pekko/stream/impl/JavaFlowAndRsConverters.scala
index 738ced4b8b..32992eff6d 100644
--- a/stream/src/main/scala-jdk-9/org/apache/pekko/stream/impl/JavaFlowAndRsConverters.scala
+++ b/stream/src/main/scala-jdk-9/org/apache/pekko/stream/impl/JavaFlowAndRsConverters.scala
@@ -25,7 +25,7 @@ import pekko.annotation.InternalApi
  * INTERNAL API: Provides converters between Reactive Streams (reactive-streams.org) and their Java 9+ counter-parts,
  * defined in `java.util.concurrent.Flow.*`. This API is internal because Reactive Streams will ship with such
  * adapters itself at some point, and we'd not want to duplicate that effort for users to be confused about which ones
- * to use. These adapters are used internally by Akka Streams to convert between the standards but you should not touch
+ * to use. These adapters are used internally by Pekko Streams to convert between the standards but you should not touch
  * them directly - use thr `JavaFlowSupport` classes instead.
  *
  * Please note that either of these types are designed for *inter-op* and usually should not be used directly
diff --git a/stream/src/main/scala/org/apache/pekko/stream/FanInShape.scala b/stream/src/main/scala/org/apache/pekko/stream/FanInShape.scala
index 8a2601db19..e70d9033b8 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/FanInShape.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/FanInShape.scala
@@ -45,7 +45,7 @@ abstract class FanInShape[+O] private (
   final override def outlets: immutable.Seq[Outlet[O @uncheckedVariance]] = _out :: Nil
 
   /**
-   * Not meant for overriding outside of Akka.
+   * Not meant for overriding outside of Apache Pekko.
    */
   override def inlets: immutable.Seq[Inlet[_]] = _inlets
 
diff --git a/stream/src/main/scala/org/apache/pekko/stream/FanOutShape.scala b/stream/src/main/scala/org/apache/pekko/stream/FanOutShape.scala
index 88a28f25e3..6301abd7ca 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/FanOutShape.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/FanOutShape.scala
@@ -44,7 +44,7 @@ abstract class FanOutShape[-I] private (
   final def in: Inlet[I @uncheckedVariance] = _in
 
   /**
-   * Not meant for overriding outside of Akka.
+   * Not meant for overriding outside of Apache Pekko.
    */
   override def outlets: immutable.Seq[Outlet[_]] = _outlets
   final override def inlets: immutable.Seq[Inlet[I @uncheckedVariance]] = in :: Nil
diff --git a/stream/src/main/scala/org/apache/pekko/stream/SslTlsOptions.scala b/stream/src/main/scala/org/apache/pekko/stream/SslTlsOptions.scala
index 3b16ffe2a6..35d60e27ef 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/SslTlsOptions.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/SslTlsOptions.scala
@@ -55,7 +55,7 @@ sealed abstract class Server extends TLSRole
 case object Server extends Server
 
 /**
- * All streams in Akka are unidirectional: while in a complex flow graph data
+ * All streams in Pekko are unidirectional: while in a complex flow graph data
  * may flow in multiple directions these individual flows are independent from
  * each other. The difference between two half-duplex connections in opposite
  * directions and a full-duplex connection is that the underlying transport
diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/package.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/package.scala
index e0a47364fc..df6bc5f9b4 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/impl/package.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/impl/package.scala
@@ -14,7 +14,7 @@
 package org.apache.pekko.stream
 
 /**
- * The architecture of Akka Streams internally consists of several distinct layers:
+ * The architecture of Apache Pekko Streams internally consists of several distinct layers:
  *
  *  * The DSLs like [[org.apache.pekko.stream.scaladsl.Flow]], [[org.apache.pekko.stream.scaladsl.Source]] etc. are the user facing API
  *    for composing streams. These DSLs are a thin wrappers around the internal [[org.apache.pekko.stream.impl.TraversalBuilder]]
@@ -41,7 +41,7 @@ package org.apache.pekko.stream
  * == Design goals ==
  *
  * The central piece for both the DSLs and materialization is the [[org.apache.pekko.stream.impl.Traversal]]. This is the
- * representation of an Akka Stream, basically a [[org.apache.pekko.stream.scaladsl.RunnableGraph]]. The design goals
+ * representation of a Pekko Stream, basically a [[org.apache.pekko.stream.scaladsl.RunnableGraph]]. The design goals
  * for [[org.apache.pekko.stream.impl.Traversal]] are:
  *
  *   * Be able to materialize a graph in one pass over the traversal
@@ -175,7 +175,7 @@ package org.apache.pekko.stream
  *       |               |                     |    |
  *    |---------Graph1---------|--- .... ---|----Graph2----|
  *
- *  It is important to note that due to reusability, an Akka Stream graph may contain the same atomic or composite
+ *  It is important to note that due to reusability, a Pekko Stream graph may contain the same atomic or composite
  *  multiple times in the same graph. Since these must be distinguished from each other somehow, they need port mapping
  *  (i.e. a new set of ports) to ensure that the ports of one graph are distinguishable from another. Because how
  *  the traversal relative addressing works, these are _temporary_ though, once all internal wirings are ready, these
diff --git a/stream/src/main/scala/org/apache/pekko/stream/javadsl/TLS.scala b/stream/src/main/scala/org/apache/pekko/stream/javadsl/TLS.scala
index 2c91d1f59a..a7d52d28e9 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/javadsl/TLS.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/javadsl/TLS.scala
@@ -38,7 +38,7 @@ import pekko.util.OptionConverters._
  *
  * Configuring JSSE is a rather complex topic, please refer to the JDK platform
  * documentation or the excellent user guide that is part of the Play Framework
- * documentation. The philosophy of this integration into Akka Streams is to
+ * documentation. The philosophy of this integration into Pekko Streams is to
  * expose all knobs and dials to client code and therefore not limit the
  * configuration possibilities. In particular the client code will have to
  * provide the SSLEngine, which is typically created from a SSLContext. Handshake
diff --git a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Flow.scala b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Flow.scala
index f0c8830002..8a02490756 100755
--- a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Flow.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Flow.scala
@@ -810,7 +810,7 @@ final case class RunnableGraph[+Mat](override val traversalBuilder: TraversalBui
  * Scala API: Operations offered by Sources and Flows with a free output side: the DSL flows left-to-right only.
  *
  * INTERNAL API: this trait will be changed in binary-incompatible ways for classes that are derived from it!
- * Do not implement this interface outside the Akka code base!
+ * Do not implement this interface outside the Pekko code base!
  *
  * Binary compatibility is only maintained for callers of this trait’s interface.
  */
@@ -3509,7 +3509,7 @@ trait FlowOps[+Out, +Mat] {
 
 /**
  * INTERNAL API: this trait will be changed in binary-incompatible ways for classes that are derived from it!
- * Do not implement this interface outside the Akka code base!
+ * Do not implement this interface outside the Pekko code base!
  *
  * Binary compatibility is only maintained for callers of this trait’s interface.
  */
diff --git a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/StreamConverters.scala b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/StreamConverters.scala
index 468b1431b1..d623383e23 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/StreamConverters.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/StreamConverters.scala
@@ -178,7 +178,7 @@ object StreamConverters {
    * The Java 8 ``Stream`` will be ended when the stream flowing into this ``Sink`` completes, and closing the Java
    * ``Stream`` will cancel the inflow of this ``Sink``.
    *
-   * If the Java 8 ``Stream`` throws exception the Akka stream is cancelled.
+   * If the Java 8 ``Stream`` throws exception the Pekko stream is cancelled.
    *
    * Be aware that Java ``Stream`` blocks current thread while waiting on next element from downstream.
    * As it is interacting wit blocking API the implementation runs on a separate dispatcher
diff --git a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/TLS.scala b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/TLS.scala
index f1cfc7aff8..4f38121536 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/TLS.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/TLS.scala
@@ -39,7 +39,7 @@ import pekko.util.ByteString
  *
  * Configuring JSSE is a rather complex topic, please refer to the JDK platform
  * documentation or the excellent user guide that is part of the Play Framework
- * documentation. The philosophy of this integration into Akka Streams is to
+ * documentation. The philosophy of this integration into Pekko Streams is to
  * expose all knobs and dials to client code and therefore not limit the
  * configuration possibilities. In particular the client code will have to
  * provide the SSLEngine, which is typically created from a SSLContext. Handshake
diff --git a/testkit/src/test/scala/org/apache/pekko/testkit/metrics/reporter/PekkoConsoleReporter.scala b/testkit/src/test/scala/org/apache/pekko/testkit/metrics/reporter/PekkoConsoleReporter.scala
index 51324db0f1..4bb4677067 100644
--- a/testkit/src/test/scala/org/apache/pekko/testkit/metrics/reporter/PekkoConsoleReporter.scala
+++ b/testkit/src/test/scala/org/apache/pekko/testkit/metrics/reporter/PekkoConsoleReporter.scala
@@ -50,7 +50,7 @@ class PekkoConsoleReporter(registry: PekkoMetricRegistry, verbose: Boolean, outp
     printMetrics(meters.asScala, printMeter)
     printMetrics(timers.asScala, printTimer)
 
-    // custom Akka types
+    // custom Pekko types
     printMetrics(registry.getKnownOpsInTimespanCounters, printKnownOpsInTimespanCounter)
     printMetrics(registry.getHdrHistograms, printHdrHistogram)
     printMetrics(registry.getAveragingGauges, printAveragingGauge)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org